patch-2.1.10 linux/drivers/cdrom/Makefile

• Lines: 29
• Date: Wed Nov 13 11:04:35 1996
• Orig file: v2.1.9/linux/drivers/cdrom/Makefile
• Orig date: Tue Nov 12 15:56:05 1996

diff -u --recursive --new-file v2.1.9/linux/drivers/cdrom/Makefile linux/drivers/cdrom/Makefile
@@ -90,11 +90,11 @@
 
 ifeq ($(CONFIG_CM206),y)
 L_OBJS += cm206.o
-C = 1 
+USE_GENERIC_CD=1
 else
   ifeq ($(CONFIG_CM206),m)
   M_OBJS += cm206.o
-  CM = 1
+    USE_MODULAR_GENERIC_CD=1
   endif
 endif #CONFIG_CM206
 
@@ -127,6 +127,14 @@
   M_OBJS += isp16.o
   endif
 endif #CONFIG_ISP16_CDI
+
+ifeq ($(CONFIG_BLK_DEV_SR),y)
+USE_GENERIC_CD=1
+else
+  ifeq ($(CONFIG_BLK_DEV_SR),m)
+    USE_MODULAR_GENERIC_CD=1
+  endif
+endif #SCSI CDROM DRIVER
 
 ifeq ($(CONFIG_BLK_DEV_IDECD),y)
 USE_GENERIC_CD=1