Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv8019/drivers/scsi
Modified Files:
Makefile scsi_ioctl.c
Log Message:
Merge with 2.5.70
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile 28 Aug 2003 00:42:08 -0000 1.25
+++ Makefile 28 Aug 2003 22:30:25 -0000 1.26
@@ -120,7 +120,7 @@
obj-$(CONFIG_SCSI_LASI700) += lasi700.o 53c700.o
obj-$(CONFIG_SCSI_NSP32) += nsp32.o
-obj-$(CONFIG_ARCH_ACORN) += ../acorn/scsi/
+obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_CHR_DEV_ST) += st.o
obj-$(CONFIG_CHR_DEV_OSST) += osst.o
@@ -130,7 +130,8 @@
scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \
scsicam.o scsi_error.o scsi_lib.o \
- scsi_scan.o scsi_syms.o scsi_sysfs.o
+ scsi_scan.o scsi_syms.o scsi_sysfs.o \
+ scsi_devinfo.o
scsi_mod-$(CONFIG_PROC_FS) += scsi_proc.o
scsi_mod-$(CONFIG_X86_PC9800) += scsi_pc98.o
Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- scsi_ioctl.c 27 Aug 2003 00:01:38 -0000 1.13
+++ scsi_ioctl.c 28 Aug 2003 22:30:25 -0000 1.14
@@ -23,6 +23,8 @@
#include "hosts.h"
#include <scsi/scsi_ioctl.h>
+#include "scsi_logging.h"
+
#define NORMAL_RETRIES 5
#define IOCTL_NORMAL_TIMEOUT (10 * HZ)
#define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ)
|
