patch-1.3.36 linux/Makefile

Next file: linux/arch/alpha/config.in
Previous file: linux/MAGIC
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.35/linux/Makefile linux/Makefile
@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 3
-SUBLEVEL = 35
+SUBLEVEL = 36
 
 ARCH = i386
 
@@ -94,7 +94,11 @@
 LIBS		=$(TOPDIR)/lib/lib.a
 SUBDIRS		=kernel drivers mm fs net ipc lib
 
-ifdef CONFIG_SCSI
+ifdef CONFIG_CD_NO_IDESCSI
+DRIVERS := $(DRIVERS) drivers/cdrom/cdrom.a
+endif
+
+ifeq ($(CONFIG_SCSI),y)
 DRIVERS := $(DRIVERS) drivers/scsi/scsi.a
 endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this