[LV-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.21,1.22 cpqioctl.c,1.1.1.1,NONE eata_dma.c,1.1.1.5,NONE eata_dma.h,1.1.1.3,NONE eata_dma_proc.c,1.1.1.2,NONE eata_dma_proc.h,1.1.1.1,NONE eata_pio_proc.c,1.1.1.3,NONE wd7000.h,1.1.1.7,NONE

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

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

Modified Files:
	Makefile 
Removed Files:
	cpqioctl.c eata_dma.c eata_dma.h eata_dma_proc.c 
	eata_dma_proc.h eata_pio_proc.c wd7000.h 
Log Message:
Merge with 2.5.63


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	4 Aug 2003 12:18:14 -0000	1.21
+++ Makefile	19 Aug 2003 20:41:13 -0000	1.22
@@ -82,7 +82,6 @@
 obj-$(CONFIG_SCSI_SYM53C8XX)	+= sym53c8xx.o 
 obj-$(CONFIG_SCSI_NCR53C8XX)	+= ncr53c8xx.o 
 obj-$(CONFIG_SCSI_ZALON)	+= zalon7xx.o
-obj-$(CONFIG_SCSI_EATA_DMA)	+= eata_dma.o
 obj-$(CONFIG_SCSI_EATA_PIO)	+= eata_pio.o
 obj-$(CONFIG_SCSI_7000FASST)	+= wd7000.o
 obj-$(CONFIG_SCSI_MCA_53C9X)	+= NCR53C9x.o	mca_53c9x.o

--- cpqioctl.c DELETED ---

--- eata_dma.c DELETED ---

--- eata_dma.h DELETED ---

--- eata_dma_proc.c DELETED ---

--- eata_dma_proc.h DELETED ---

--- eata_pio_proc.c DELETED ---

--- wd7000.h DELETED ---