Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv1587/drivers/scsi
Modified Files:
Makefile
Log Message:
Merge with 2.5.9
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 4 Dec 2002 10:48:49 -0000 1.4
+++ Makefile 13 Dec 2002 01:42:43 -0000 1.5
@@ -13,6 +13,7 @@
# satisfy certain initialization assumptions in the SCSI layer.
# *!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!
+
CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
@@ -27,6 +28,7 @@
subdir-$(CONFIG_SCSI_AIC7XXX) += aic7xxx
subdir-$(CONFIG_PCMCIA) += pcmcia
+
obj-$(CONFIG_SCSI) += scsi_mod.o
obj-$(CONFIG_A4000T_SCSI) += amiga7xx.o 53c7xx.o
@@ -63,7 +65,7 @@
obj-$(CONFIG_SCSI_AHA1542) += aha1542.o
obj-$(CONFIG_SCSI_AHA1740) += aha1740.o
ifeq ($(CONFIG_SCSI_AIC7XXX),y)
-obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx_drv.o
+obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx/aic7xxx_drv.o
endif
obj-$(CONFIG_SCSI_AIC7XXX_OLD) += aic7xxx_old.o
obj-$(CONFIG_SCSI_IPS) += ips.o
@@ -87,7 +89,7 @@
obj-$(CONFIG_SCSI_NCR53C7xx) += 53c7,8xx.o
subdir-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2
ifeq ($(CONFIG_SCSI_SYM53C8XX_2),y)
- obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/sym53c8xx.o
+ obj-$(CONFIG_SCSI_SYM53C8XX_2) += sym53c8xx_2/sym53c8xx_2.o
endif
obj-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
obj-$(CONFIG_SCSI_NCR53C8XX) += ncr53c8xx.o
@@ -116,8 +118,12 @@
obj-$(CONFIG_SCSI_IMM) += imm.o
obj-$(CONFIG_JAZZ_ESP) += NCR53C9x.o jazz_esp.o
obj-$(CONFIG_SUN3X_ESP) += NCR53C9x.o sun3x_esp.o
+
+# VAX stuff
obj-$(CONFIG_SCSI_VAX_5380) += vax-5380.o
-obj-$(CONFIG_SCSI_VAX_53C94) += NCR53C9x.o vax_esp.o
+obj-$(CONFIG_SCSI_VAX_53C94) += NCR53C9x.o vax_esp.o
+# end VAX stuff
+
obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
obj-$(CONFIG_SCSI_FCAL) += fcal.o
obj-$(CONFIG_SCSI_CPQFCTS) += cpqfc.o
@@ -132,14 +138,10 @@
obj-$(CONFIG_BLK_DEV_SR) += sr_mod.o
obj-$(CONFIG_CHR_DEV_SG) += sg.o
-list-multi := scsi_mod.o sd_mod.o sr_mod.o initio.o a100u2w.o cpqfc.o
-scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o \
- scsicam.o scsi_proc.o scsi_error.o \
- scsi_queue.o scsi_lib.o \
- scsi_merge.o scsi_dma.o scsi_scan.o \
- scsi_syms.o
-
-sd_mod-objs := sd.o
+scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
+ scsi_proc.o scsi_error.o scsi_queue.o scsi_lib.o \
+ scsi_merge.o scsi_scan.o scsi_syms.o
+sd_mod-objs := sd.o
sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o
initio-objs := ini9100u.o i91uscsi.o
a100u2w-objs := inia100.o i60uscsi.o
@@ -147,25 +149,6 @@
cpqfcTSworker.o cpqfcTStrigger.o
include $(TOPDIR)/Rules.make
-
-
-scsi_mod.o: $(scsi_mod-objs)
- $(LD) -r -o $@ $(scsi_mod-objs)
-
-sd_mod.o: $(sd_mod-objs)
- $(LD) -r -o $@ $(sd_mod-objs)
-
-sr_mod.o: $(sr_mod-objs)
- $(LD) -r -o $@ $(sr_mod-objs)
-
-initio.o: $(initio-objs)
- $(LD) -r -o $@ $(initio-objs)
-
-a100u2w.o: $(a100u2w-objs)
- $(LD) -r -o $@ $(a100u2w-objs)
-
-cpqfc.o: $(cpqfc-objs)
- $(LD) -r -o $@ $(cpqfc-objs)
53c8xx_d.h: 53c7,8xx.scr script_asm.pl
ln -sf 53c7,8xx.scr fake8.c
|
