[LV-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.22,1.23 scsi_ioctl.c,1.11,1.12

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

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

Modified Files:
	Makefile scsi_ioctl.c 
Log Message:
Merge with 2.5.64


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile	19 Aug 2003 20:41:13 -0000	1.22
+++ Makefile	23 Aug 2003 12:44:06 -0000	1.23
@@ -126,13 +126,11 @@
 obj-$(CONFIG_BLK_DEV_SR)	+= sr_mod.o
 obj-$(CONFIG_CHR_DEV_SG)	+= sg.o
 
-scsi_mod-objs	:= 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
-
-ifdef CONFIG_PROC_FS
-scsi_mod-objs	+= scsi_proc.o
-endif
+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_mod-$(CONFIG_PROC_FS)	+= scsi_proc.o
+scsi_mod-$(CONFIG_X86_PC9800)	+= scsi_pc98.o
 			
 sd_mod-objs	:= sd.o
 sr_mod-objs	:= sr.o sr_ioctl.o sr_vendor.o

Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scsi_ioctl.c	7 Jul 2003 23:47:31 -0000	1.11
+++ scsi_ioctl.c	23 Aug 2003 12:44:06 -0000	1.12
@@ -194,7 +194,7 @@
  *      of the given command. There is no way to override this.
  *   -  Data transfers are limited to PAGE_SIZE (4K on i386, 8K on alpha).
  *   -  The length (x + y) must be at least OMAX_SB_LEN bytes long to
- *      accomodate the sense buffer when an error occurs.
+ *      accommodate the sense buffer when an error occurs.
  *      The sense buffer is truncated to OMAX_SB_LEN (16) bytes so that
  *      old code will not be surprised.
  *   -  If a Unix error occurs (e.g. ENOMEM) then the user will receive