Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/drivers/scsi
Modified Files:
Makefile
Removed Files:
ChangeLog ChangeLog.ips ChangeLog.ncr53c8xx
ChangeLog.serverraid ChangeLog.sym53c8xx LICENSE.FlashPoint
README.53c700 README.AM53C974 README.BusLogic
README.FlashPoint README.Mylex README.aha152x README.aic7xxx
README.dpti README.dtc3x80 README.g_NCR5380 README.ibmmca
README.in2000 README.ncr53c7xx README.ncr53c8xx README.osst
README.ppa README.qlogicfas README.qlogicisp README.st
README.tmscsim cpqfc.Readme scsi_mid_low_api.txt
Log Message:
Merge with 2.5.48
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 11 May 2003 20:28:23 -0000 1.15
+++ Makefile 19 Jun 2003 23:31:47 -0000 1.16
@@ -18,7 +18,7 @@
CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
-export-objs := scsi_syms.o 53c700.o
+export-objs := scsi_syms.o scsi_proc.o 53c700.o
subdir-$(CONFIG_PCMCIA) += pcmcia
@@ -129,8 +129,11 @@
obj-$(CONFIG_CHR_DEV_SG) += sg.o
scsi_mod-objs := scsi.o hosts.o scsi_ioctl.o constants.o scsicam.o \
- scsi_proc.o scsi_error.o scsi_lib.o scsi_scan.o \
- scsi_syms.o
+ scsi_error.o scsi_lib.o scsi_scan.o scsi_syms.o
+
+ifdef CONFIG_PROC_FS
+scsi_mod-objs += scsi_proc.o
+endif
sd_mod-objs := sd.o
sr_mod-objs := sr.o sr_ioctl.o sr_vendor.o
--- ChangeLog DELETED ---
--- ChangeLog.ips DELETED ---
--- ChangeLog.ncr53c8xx DELETED ---
--- ChangeLog.serverraid DELETED ---
--- ChangeLog.sym53c8xx DELETED ---
--- LICENSE.FlashPoint DELETED ---
--- README.53c700 DELETED ---
--- README.AM53C974 DELETED ---
--- README.BusLogic DELETED ---
--- README.FlashPoint DELETED ---
--- README.Mylex DELETED ---
--- README.aha152x DELETED ---
--- README.aic7xxx DELETED ---
--- README.dpti DELETED ---
--- README.dtc3x80 DELETED ---
--- README.g_NCR5380 DELETED ---
--- README.ibmmca DELETED ---
--- README.in2000 DELETED ---
--- README.ncr53c7xx DELETED ---
--- README.ncr53c8xx DELETED ---
--- README.osst DELETED ---
--- README.ppa DELETED ---
--- README.qlogicfas DELETED ---
--- README.qlogicisp DELETED ---
--- README.st DELETED ---
--- README.tmscsim DELETED ---
--- cpqfc.Readme DELETED ---
--- scsi_mid_low_api.txt DELETED ---
|
