[LV-k25-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.9,1.10 scsi_queue.c,1.1.1.4,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv6356/drivers/scsi

Modified Files:
	Makefile 
Removed Files:
	scsi_queue.c 
Log Message:
Merge with 2.5.37


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	27 Jan 2003 01:28:21 -0000	1.9
+++ Makefile	17 Feb 2003 01:15:02 -0000	1.10
@@ -126,8 +126,9 @@
 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_queue.o scsi_lib.o \
-			scsi_merge.o scsi_scan.o scsi_syms.o
+			scsi_proc.o scsi_error.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

--- scsi_queue.c DELETED ---