make fails compiling SCSI support on CURRENT

Hi,

I just upgraded my sources from 5.2 RELEASE to CURRENT via CVSup.

make stops after getting these error messages:

cc -c -O -pipe -mcpu=pentiumpro -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline 
-Wcast-qual  -fformat-extensions -std=c99  -nostdinc -I-  -I. -I../../.. 
-I../../../contrib/dev/acpica -I../../../contrib/ipfilter 
-I../../../contrib/pf -I../../../contrib/dev/ath 
-I../../../contrib/dev/ath/freebsd -I../../../contrib/ngatm -D_KERNEL 
-include opt_global.h -fno-common -finline-limit=8000 
-mno-align-long-strings -mpreferred-stack-boundary=2 -ffreestanding 
-Werror  ../../../dev/aic7xxx/aic79xx.c
../../../dev/aic7xxx/aic79xx.c: In function `ahd_flush_qoutfifo':
../../../dev/aic7xxx/aic79xx.c:454: error: `COMPLETE_DMA_SCB_TAIL' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c:454: error: (Each undeclared identifier 
is reported only once
../../../dev/aic7xxx/aic79xx.c:454: error: for each function it appears in.)
../../../dev/aic7xxx/aic79xx.c:531: error: `COMPLETE_ON_QFREEZE_HEAD' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c: In function `ahd_chip_init':
../../../dev/aic7xxx/aic79xx.c:6680: error: `COMPLETE_DMA_SCB_TAIL' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c:6681: error: `COMPLETE_ON_QFREEZE_HEAD' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c:6688: error: `KERNEL_QFREEZE_COUNT' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c: In function `ahd_pause_and_flushwork':
../../../dev/aic7xxx/aic79xx.c:7058: error: `KERNEL_QFREEZE_COUNT' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c: In function `ahd_handle_scsi_status':
../../../dev/aic7xxx/aic79xx.c:8067: error: `KERNEL_QFREEZE_COUNT' 
undeclared (first use in this function)
../../../dev/aic7xxx/aic79xx.c: In function `ahd_dump_card_state':
../../../dev/aic7xxx/aic79xx.c:8989: error: `COMPLETE_ON_QFREEZE_HEAD' 
undeclared (first use in this function)
*** Error code 1

Stop in /usr/src/sys/i386/compile/ATHLONS.

Has somebody an idea where I could start to fix it?

Thanks!

Erich