problem building if_ndis today

I haven't seen anyone else complain about this so I've probably done
something stupid.

machine -> /usr/src/sys/i386/include
touch opt_bdg.h
awk -f _at_/tools/makeobjops.awk _at_/kern/device_if.m -h
awk -f _at_/tools/makeobjops.awk _at_/kern/bus_if.m -h
awk -f _at_/tools/makeobjops.awk _at_/dev/pci/pci_if.m -h
awk -f _at_/tools/makeobjops.awk _at_/dev/pccard/card_if.m -h
cc -O -pipe  -D_KERNEL -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/../include -I/usr/include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /usr/src/sys/modules/if_ndis/../../dev/if_ndis/if_ndis.c
cc -O -pipe  -D_KERNEL -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/../include -I/usr/include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /usr/src/sys/modules/if_ndis/../../dev/if_ndis/if_ndis_pci.c
cc -O -pipe  -D_KERNEL -DKLD_MODULE -nostdinc -I-   -I. -I_at_ -I_at_/../include -I/usr/include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c /usr/src/sys/modules/if_ndis/../../dev/if_ndis/if_ndis_pccard.c
ld  -d -warn-common -r -d -o if_ndis.kld if_ndis.o if_ndis_pci.o if_ndis_pccard.o
if_ndis_pci.o(.data+0x0): multiple definition of `ndis_regvals'
if_ndis.o(.data+0x0): first defined here
if_ndis_pccard.o(.data+0x0): multiple definition of `ndis_regvals'
if_ndis.o(.data+0x0): first defined here
*** Error code 1

Stop in /usr/src/sys/modules/if_ndis.


I have built world:
Starting update: Wed Mar 31 23:45:39 EST 2004
Finished update: Wed Mar 31 23:52:48 EST 2004
Starting buildworld: Wed Mar 31 23:52:48 EST 2004
Finished buildworld: Thu Apr  1 01:12:05 EST 2004
Starting buildkernel GENERIC: Thu Apr  1 01:12:05 EST 2004
Finished buildkernel GENERIC: Thu Apr  1 01:38:00 EST 2004
Starting buildkernel PRESARIO: Thu Apr  1 01:38:00 EST 2004
Finished buildkernel PRESARIO: Thu Apr  1 01:57:54 EST 2004

I have not installed world nor rebooted to the new kernel yet.  I am
running -CURRENT from March 3, 2004.

sys/module/if_ndis/
cvs status: Examining .
===================================================================
File: Makefile          Status: Up-to-date

   Working revision:    1.3     Thu Mar 18 04:10:07 2004
   Repository revision: 1.3     /home/ncvs/src/sys/modules/if_ndis/Makefile,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

sys/dev/if_ndis/
cvs status: Examining .
===================================================================
File: if_ndis.c         Status: Up-to-date

   Working revision:    1.51    Wed Mar 31 15:22:14 2004
   Repository revision: 1.51    /home/ncvs/src/sys/dev/if_ndis/if_ndis.c,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: if_ndis_pccard.c  Status: Up-to-date

   Working revision:    1.4     Wed Mar 31 15:22:14 2004
   Repository revision: 1.4     /home/ncvs/src/sys/dev/if_ndis/if_ndis_pccard.c,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: if_ndis_pci.c     Status: Up-to-date

   Working revision:    1.5     Wed Mar 31 15:22:14 2004
   Repository revision: 1.5     /home/ncvs/src/sys/dev/if_ndis/if_ndis_pci.c,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: if_ndisvar.h      Status: Up-to-date

   Working revision:    1.11    Thu Mar 18 04:09:26 2004
   Repository revision: 1.11    /home/ncvs/src/sys/dev/if_ndis/if_ndisvar.h,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)



-- 
Scott Lambert                    KC5MLE                       Unix SysAdmin
lambert_at_lambertfam.org       http://www.lambertfam.org/~lambert/resume.html