patch-2.1.70 linux/drivers/cdrom/Makefile

• Lines: 59
• Date: Tue Dec 2 11:41:44 1997
• Orig file: v2.1.69/linux/drivers/cdrom/Makefile
• Orig date: Mon Apr 14 16:28:11 1997

diff -u --recursive --new-file v2.1.69/linux/drivers/cdrom/Makefile linux/drivers/cdrom/Makefile
@@ -90,11 +90,9 @@
 
 ifeq ($(CONFIG_CM206),y)
 L_OBJS += cm206.o
-USE_GENERIC_CD=1
 else
   ifeq ($(CONFIG_CM206),m)
   M_OBJS += cm206.o
-    USE_MODULAR_GENERIC_CD=1
   endif
 endif #CONFIG_CM206
 
@@ -122,42 +120,20 @@
   endif
 endif #CONFIG_BPCD
 
-ifeq ($(CONFIG_CDI_INIT),y)
-L_OBJS += cdi.o
-endif #CONFIG_CDI_INIT
 ifeq ($(CONFIG_ISP16_CDI),y)
 L_OBJS += isp16.o
 else
-#  ifeq ($(CONFIG_CDI_INIT),m)
-#  M_OBJS += cdi.o
-#  endif
   ifeq ($(CONFIG_ISP16_CDI),m)
   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
-else
-  ifeq ($(CONFIG_BLK_DEV_IDECD),m)
-    USE_MODULAR_GENERIC_CD=1
-  endif
-endif #CONFIG_BLK_DEV_IDECD
-
-ifdef USE_GENERIC_CD
+ifeq ($(CONFIG_CDROM),y)
 LX_OBJS += cdrom.o
 else
-  ifdef USE_MODULAR_GENERIC_CD
+  ifeq ($(CONFIG_CDROM),m)
   MX_OBJS += cdrom.o
   endif
-endif #The Makefile configuration for the generic cdrom interface
-  
+endif #CONFIG_CDROM for the Uniform CD-ROM driver
+
 include $(TOPDIR)/Rules.make