cardbus compilation failure

I recently updated four of my machines to the latest current and am
having problems getting the kernel to build:

cc -c -O -pipe -march=pentium3 -Wall -Wredundant-decls
-Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes
-Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -g
-nostdinc -I-  -I. -I/usr/src/sys -I/usr/src/sys/contrib/altq
-D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
-fno-common -finline-limit=8000 --param inline-unit-growth=100 --param
large-function-growth=1000  -mno-align-long-strings
-mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2
-mno-sse3 -ffreestanding -Werror  /usr/src/sys/dev/cardbus/cardbus.c
/usr/src/sys/dev/cardbus/cardbus.c: In function `cardbus_alloc_resources':
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: implicit declaration
of function `BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: nested extern
declaration of `BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:208: warning: nested extern
declaration of `BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: redundant
redeclaration of 'BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: previous implicit
declaration of 'BARBIT' was here
/usr/src/sys/dev/cardbus/cardbus.c:243: warning: nested extern
declaration of `BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: redundant
redeclaration of 'BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: previous implicit
declaration of 'BARBIT' was here
/usr/src/sys/dev/cardbus/cardbus.c:263: warning: nested extern
declaration of `BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: redundant
redeclaration of 'BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: previous implicit
declaration of 'BARBIT' was here
/usr/src/sys/dev/cardbus/cardbus.c:299: warning: nested extern
declaration of `BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: redundant
redeclaration of 'BARBIT'
/usr/src/sys/dev/cardbus/cardbus.c:187: warning: previous implicit
declaration of 'BARBIT' was here
*** Error code 1

Stop in /u0/obj/usr/src/sys/GENERIC.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

I've cvsup'ed a couple of times, and rebuilt and installed world,
removed /usr/obj/* and still get this problem.

I notice that it affected tinderbox on 12/29 & 30, but I find no
discussion of it - I guess it was resolved 12/31 or later - can
someone tell me what I may be doing wrong?

(I did google it and searched my current mail for mentions of BARBIT,
finding only the tinderbox failures)

thanks,
dave c