diff -u -r1.605 files --- src.dist/sys/conf/files Mon Mar 18 09:35:39 2002 +++ sys/conf/files Tue Mar 19 11:24:21 2002 @@ -135,6 +135,7 @@ dev/ata/atapi-all.c optional atapicd dev/ata/atapi-all.c optional atapifd dev/ata/atapi-all.c optional atapist +dev/ata/atapi-cam.c optional atapicam dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist diff -u sys.dist/src/sys/conf/options sys/conf/options --- sys.dist/src/sys/conf/options Sun Nov 4 11:30:22 2001 +++ sys/conf/options Tue Feb 5 19:23:26 2002 @@ -223,6 +223,7 @@ # Options used in the 'ata' ATA/ATAPI driver ATA_STATIC_ID opt_ata.h +ATAPICAM opt_ata.h # Net stuff. ACCEPT_FILTER_DATA diff -u sys.dist/src/sys/i386/conf/LINT sys/i386/conf/LINT --- sys.dist/src/sys/i386/conf/LINT Tue Feb 5 19:15:07 2002 +++ sys/i386/conf/LINT Tue Feb 5 19:23:26 2002 @@ -1198,7 +1198,10 @@ # # ATA_STATIC_ID: controller numbering is static (like the old driver) # else the device numbers are dynamically allocated. +# ATAPICAM: register ATAPI devices with the CAM layer so +# they can be addressed as SCSI devices. options ATA_STATIC_ID +options ATAPICAM # # For older non-PCI systems, these are the lines to use: