patch-2.3.27 linux/drivers/scsi/Makefile

• Lines: 42
• Date: Wed Nov 10 08:40:04 1999
• Orig file: v2.3.26/linux/drivers/scsi/Makefile
• Orig date: Sat Oct 9 11:47:50 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/scsi/Makefile linux/drivers/scsi/Makefile
@@ -58,7 +58,7 @@
 endif
 
 ifeq ($(CONFIG_BLK_DEV_SD),y)
-L_OBJS += sd.o sd_ioctl.o
+L_OBJS += sd.o
 else
   ifeq ($(CONFIG_BLK_DEV_SD),m)
   M_OBJS += sd_mod.o
@@ -265,14 +265,22 @@
   endif
 endif
 
-ifeq ($(CONFIG_MAC_SCSI_OLD),y)
+ifeq ($(CONFIG_MAC_SCSI),y)
 L_OBJS += mac_scsi.o
 else
-  ifeq ($(CONFIG_MAC_SCSI_OLD),m)
+  ifeq ($(CONFIG_MAC_SCSI),m)
   M_OBJS += mac_scsi.o
   endif
 endif
 
+ifeq ($(CONFIG_SUN3_SCSI),y)
+L_OBJS += sun3_scsi.o
+else
+  ifeq ($(CONFIG_SUN3_SCSI),m)
+  M_OBJS += sun3_scsi.o
+  endif
+endif
+
 ifeq ($(CONFIG_SCSI_MAC_ESP),y)
 L_OBJS += mac_esp.o NCR53C9x.o
 else
@@ -721,5 +729,5 @@
 sr_mod.o: sr.o sr_ioctl.o sr_vendor.o
 	$(LD) $(LD_RFLAG) -r -o $@ sr.o sr_ioctl.o sr_vendor.o
 
-sd_mod.o: sd.o sd_ioctl.o
-	$(LD) $(LD_RFLAG) -r -o $@ sd.o sd_ioctl.o
+sd_mod.o: sd.o
+	$(LD) $(LD_RFLAG) -r -o $@ sd.o