failed -current build

Today I attempted to build the latest -current but got the following when
trying to compile the kernel:

../../../dev/cardbus/cardbus.c:380: error: `card_cis_read_desc' undeclared
here (not in a function)
../../../dev/cardbus/cardbus.c:380: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:380: error: (near initialization for
`cardbus_methods[27].desc')
../../../dev/cardbus/cardbus.c:380: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:380: error: (near initialization for
`cardbus_methods[27]')
../../../dev/cardbus/cardbus.c:381: error: `card_cis_free_desc' undeclared
here (not in a function)
../../../dev/cardbus/cardbus.c:381: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:381: error: (near initialization for
`cardbus_methods[28].desc')
../../../dev/cardbus/cardbus.c:381: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:381: error: (near initialization for
`cardbus_methods[28]')
../../../dev/cardbus/cardbus.c:384: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:384: error: (near initialization for
`cardbus_methods[29]')
../../../dev/cardbus/cardbus.c:385: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:385: error: (near initialization for
`cardbus_methods[30]')
../../../dev/cardbus/cardbus.c:386: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:386: error: (near initialization for
`cardbus_methods[31]')
../../../dev/cardbus/cardbus.c:387: error: initializer element is not
constant
../../../dev/cardbus/cardbus.c:387: error: (near initialization for
`cardbus_methods[32]')

and several more of those errors.  I found old posts stating this a gcc
bug so I did a make buildworld && make installworld before trying to
compile my kernel but to no avail.

-James