patch-2.1.70 linux/Makefile

• Lines: 17
• Date: Tue Dec 2 11:41:44 1997
• Orig file: v2.1.69/linux/Makefile
• Orig date: Tue Dec 2 09:49:38 1997

diff -u --recursive --new-file v2.1.69/linux/Makefile linux/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 1
-SUBLEVEL = 69
+SUBLEVEL = 70
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/)
 
@@ -133,7 +133,7 @@
 DRIVERS := $(DRIVERS) drivers/scsi/scsi.a
 endif
 
-ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR),)
+ifeq ($(CONFIG_CDROM),y)
 DRIVERS := $(DRIVERS) drivers/cdrom/cdrom.a
 endif