kernel build is failing with atapicam in current.

Is atapicam still needed for programs like cdrecord?  I don't see 
anotations in UPDATING.  Assuming that it is my kernel build seems to
be broken as follows:

cc -c -O2 -pipe -fno-strict-aliasing  -Wall -Wredundant-decls
-Wnested-externs -Wstrict-prototypes  -Wmissing-
prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions
-std=c99  -nostdinc -I-  -I. -I/usr/src/s
ys -I/usr/src/sys/contrib/dev/acpica -I/usr/src/sys/contrib/altq
-I/usr/src/sys/contrib/ipfilter -I/usr/src/sy
s/contrib/pf -I/usr/src/sys/contrib/dev/ath
-I/usr/src/sys/contrib/dev/ath/freebsd -I/usr/src/sys/contrib/ngat
m -D_KERNEL -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 -ffreestanding -Werror  /usr/src/sys/dev/ata/atapi-cam.c
/usr/src/sys/dev/ata/atapi-cam.c:112: warning: no previous prototype
for 'atapi_cam_attach_bus'
/usr/src/sys/dev/ata/atapi-cam.c:178: warning: no previous prototype
for 'atapi_cam_detach_bus'
/usr/src/sys/dev/ata/atapi-cam.c:187: warning: no previous prototype
for 'atapi_cam_reinit_bus'
/usr/src/sys/dev/ata/atapi-cam.c: In function `reinit_bus':
/usr/src/sys/dev/ata/atapi-cam.c:208: error: structure has no member
named `device'
/usr/src/sys/dev/ata/atapi-cam.c:208: error: `MASTER' undeclared
(first use in this function)
/usr/src/sys/dev/ata/atapi-cam.c:208: error: (Each undeclared
identifier is reported only once
/usr/src/sys/dev/ata/atapi-cam.c:208: error: for each function it appears in.)
/usr/src/sys/dev/ata/atapi-cam.c:210: error: structure has no member
named `device'
/usr/src/sys/dev/ata/atapi-cam.c:210: error: `SLAVE' undeclared (first
use in this function)
/usr/src/sys/dev/ata/atapi-cam.c: In function `setup_dev':
/usr/src/sys/dev/ata/atapi-cam.c:227: error: structure has no member
named `softc'
/usr/src/sys/dev/ata/atapi-cam.c:228: warning: implicit declaration of
function `ata_set_name'
/usr/src/sys/dev/ata/atapi-cam.c:228: warning: nested extern
declaration of `ata_set_name'
/usr/src/sys/dev/ata/atapi-cam.c:229: error: structure has no member
named `channel'
/usr/src/sys/dev/ata/atapi-cam.c:231: error: structure has no member
named `softc'
/usr/src/sys/dev/ata/atapi-cam.c: In function `atapi_action':
/usr/src/sys/dev/ata/atapi-cam.c:285: error: structure has no member
named `device'
/usr/src/sys/dev/ata/atapi-cam.c:334: warning: passing arg 1 of
`ata_reinit' from incompatible pointer type
/usr/src/sys/dev/ata/atapi-cam.c:417: warning: implicit declaration of
function `ata_prtdev'
/usr/src/sys/dev/ata/atapi-cam.c:417: warning: nested extern
declaration of `ata_prtdev'
/usr/src/sys/dev/ata/atapi-cam.c:494: error: structure has no member
named `device'
/usr/src/sys/dev/ata/atapi-cam.c: In function `get_ata_device':
/usr/src/sys/dev/ata/atapi-cam.c:797: error: structure has no member
named `device'

Thanks,

ed