I applied the new diff for atapi, but I couldn't get the kernel to compile,
I have the folllowing errors:

cc  -O2 -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes -I. -I../../../../arch -I../../../.. -nostdinc -DSWAPPAGER -DVNODEPAGER -DDEVPAGER -DEXEC_AOUT -DEXEC_SCRIPT -DI686_CPU -DXSERVER -DUCONSOLE -DINSECURE -DRTC_OFFSET="0" -DSYSVMSG -DSYSVSEM -DS


YSVSHM -DCOMPAT_NOMID -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_11 -DCOMPAT_12 -DCOMPAT_43 -DTCP_COMPAT_42 -DCOMPAT_SVR4 -DCOMPAT_IBCS2 -DCOMPAT_LINUX -DCOMPAT_FREEBSD -DEXEC_ELF32 -DUSER_LDT -DLKM -DFFS -DLFS -DMFS -DNFS -DCD9660 -DMSDOSFS -DFDESC -DKERNFS -DNULL


FS -DPORTAL -DPROCFS -DUMAPFS -DUNION -DFIFO -DINET -DNS -DISO -DTPIP -DEON -DCCITT -DLLC -DHDLC -DEISAVERBOSE -DPCIVERBOSE -DMAXUSERS=32 -D_KERNEL  -Di386  -c ../../../../arch/i386/i386/conf.c
../../../../arch/i386/i386/conf.c:86: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: `acdopen' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: initializer element for `bdevsw[18].d_open' is not constant
../../../../arch/i386/i386/conf.c:86: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: `acdclose' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: initializer element for `bdevsw[18].d_close' is not constant
../../../../arch/i386/i386/conf.c:86: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: `acdstrategy' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: initializer element for `bdevsw[18].d_strategy' is not constant
../../../../arch/i386/i386/conf.c:86: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: `acdioctl' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: initializer element for `bdevsw[18].d_ioctl' is not constant
../../../../arch/i386/i386/conf.c:86: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: `acddump' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: initializer element for `bdevsw[18].d_dump' is not constant
../../../../arch/i386/i386/conf.c:86: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: `acdsize' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:86: initializer element for `bdevsw[18].d_psize' is not constant
../../../../arch/i386/i386/conf.c:213: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: `acdopen' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: initializer element for `cdevsw[25].d_open' is not constant
../../../../arch/i386/i386/conf.c:213: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: `acdclose' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: initializer element for `cdevsw[25].d_close' is not constant
../../../../arch/i386/i386/conf.c:213: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: `acdread' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: initializer element for `cdevsw[25].d_read' is not constant
../../../../arch/i386/i386/conf.c:213: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: `acdwrite' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: initializer element for `cdevsw[25].d_write' is not constant
../../../../arch/i386/i386/conf.c:213: `NACD' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: `acdioctl' undeclared here (not in a function)
../../../../arch/i386/i386/conf.c:213: initializer element for `cdevsw[25].d_ioctl' is not constant
*** Error code 1

Stop.

what's wrong with conf.c?

/ayn

--
Andrew Y Ng <ayn@CMU.EDU> | Carnegie Mellon University
http://andrew.Ngbert.org  | ECE major  // 4-yr BS/MS
campus ph: 412/862-2836   | voice mail: 412/268-6700 Box 30027
                          | talk: finger ayn@andrew.Ngbert.org
   * NGBERT.ORG! *        |       for online status
http://www.Ngbert.org     | finger ayn@CMU.EDU for more info...
--------------------------X------------------------------------- 
   NetBSD   NeXT   FreeBSD    Linux  Be   Solaris   !windoze

It's a good thing we don't get all the government we pay for.