patch-2.1.9 linux/Makefile

• Lines: 25
• Date: Tue Nov 12 10:32:40 1996
• Orig file: v2.1.8/linux/Makefile
• Orig date: Sun Nov 10 20:12:08 1996

diff -u --recursive --new-file v2.1.8/linux/Makefile linux/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 1
-SUBLEVEL = 8
+SUBLEVEL = 9
 
 ARCH = i386
 
@@ -126,12 +126,12 @@
 
 DRIVERS := $(DRIVERS) drivers/net/net.a
 
-ifdef CONFIG_CD_NO_IDESCSI
-DRIVERS := $(DRIVERS) drivers/cdrom/cdrom.a
-endif
-
 ifeq ($(CONFIG_SCSI),y)
 DRIVERS := $(DRIVERS) drivers/scsi/scsi.a
+endif
+
+ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR),)
+DRIVERS := $(DRIVERS) drivers/cdrom/cdrom.a
 endif
 
 ifeq ($(CONFIG_SOUND),y)