ndis (broadcom) quit working after a cvsup

[Mark A-J. Raught (from the laptop)]

So after giving someone advice on how to get ndis working yesterday (it
didn't help, but I was confident enough to share my experience), I cvsup
and now I think I'm going nuts...

first,

uname -a:

FreeBSD lore 5.4-STABLE FreeBSD 5.4-STABLE #16: Sat Jul  2 01:52:13 EDT
2005     flash at lore:/usr/src/sys/i386/compile/LORE  i386

on a Gateway 7325GZ with a Broadcom BCM43XX (from the NDIS inf file that 
has been working)

I ran cvsup last night from 5.4."probably a month or two ago" to
5.4."Jul2" as shown above.

My sound and my ndis quit working as usual (everytime I recompile the
kernel I lose ndis and everytime I cvsup I lose the sound)
the sound shouldn't be a problem, just diff ac97.c and ac97.h (I'll look
at it later)

the ndis should also be no problem...

So I:
  go into /sys/modules/ndis and make clean; make; make install; make load
  go into /sys/modules/if_ndis and make clean; make; make install; make load

both with no errors. Everything looks good. I hit fn-<F2> which usually
enables my wireless at this point and ndis0 appears in ifconfig -a, just
a quick "ifconfig ndis0 up" and it'll all be good.

Wait a minute! No ndis0 shows up! Am I missing a step? I'm pretty sure
this is all I had to do the last couple times, but now that the laptop
is a couple months old I haven't been changing things as much and may
have missed a step. ok...

I did notice that now kldload ndis or kldload if_ndis both will load the
other one. So where I used to kldload ndis then kldload if_ndis, now I
kldload ndis without an error, then kldload if_ndis gives: "kldload:
can't load if_ndis: File exists" and vice versa... After either is 
kldloaded, we get

[lore] ~# kldstat
Id Refs Address    Size     Name
  1   16 0xc0400000 34ec10   kernel
  3    1 0xc0753000 587c     vesa.ko
  4    1 0xc0759000 1b34c    linux.ko
  7   14 0xc0797000 56270    acpi.ko
  8    1 0xc18a7000 2000     blank_saver.ko
12    1 0xc1bbf000 9000     if_ndis.ko
13    1 0xc1bc8000 12000    ndis.ko
[lore] ~#

so they are loading...

I haven't changed my kernel or any other files (except throug
mergemaster after the installworld) and I didn't see anything relevant
in /usr/src/UPDATING

After plenty of playing and googling until 4AM and 4 more hours this 
morning, I'm stumped.

any ideas???

thanks,
-mark