[LV-k25-commit] CVS: kernel-2.5/drivers/scsi Makefile,1.7,1.8 scsi_ioctl.c,1.4,1.5 scsi_merge.c,1.6,1.7 constants.h,1.1.1.1,NONE

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

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

Modified Files:
	Makefile scsi_ioctl.c scsi_merge.c 
Removed Files:
	constants.h 
Log Message:
Merge with 2.5.22


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	12 Jan 2003 22:52:53 -0000	1.7
+++ Makefile	25 Jan 2003 00:33:32 -0000	1.8
@@ -19,8 +19,6 @@
 CFLAGS_seagate.o =   -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
 
 export-objs	:= scsi_syms.o 53c700.o
-mod-subdirs	:= pcmcia ../acorn/scsi
-
 
 subdir-$(CONFIG_PCMCIA)		+= pcmcia
 

Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scsi_ioctl.c	5 Jun 2002 21:55:04 -0000	1.4
+++ scsi_ioctl.c	25 Jan 2003 00:33:32 -0000	1.5
@@ -127,7 +127,7 @@
 				/* gag this error, VFS will log it anyway /axboe */
 				/* printk(KERN_INFO "Disc change detected.\n"); */
 				break;
-			};
+			}
 		default:	/* Fall through for non-removable media */
 			printk("SCSI error: host %d id %d lun %d return code = %x\n",
 			       dev->host->host_no,
@@ -139,7 +139,7 @@
 			       sense_error(SRpnt->sr_sense_buffer[0]),
 			       SRpnt->sr_sense_buffer[2] & 0xf);
 
-		};
+		}
 
 	result = SRpnt->sr_result;
 
@@ -152,7 +152,7 @@
 }
 
 /*
- * This interface is depreciated - users should use the scsi generic (sg)
+ * This interface is deprecated - users should use the scsi generic (sg)
  * interface instead, as this is a more flexible approach to performing
  * generic SCSI commands on a device.
  *
@@ -523,22 +523,3 @@
 	set_fs(oldfs);
 	return tmp;
 }
-
-/*
- * Overrides for Emacs so that we almost follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-indent-level: 4
- * c-brace-imaginary-offset: 0
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * c-continued-statement-offset: 4
- * c-continued-brace-offset: 0
- * indent-tabs-mode: nil
- * tab-width: 8
- * End:
- */

Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scsi_merge.c	31 Dec 2002 22:37:18 -0000	1.6
+++ scsi_merge.c	25 Jan 2003 00:33:32 -0000	1.7
@@ -42,7 +42,6 @@
 
 #include "scsi.h"
 #include "hosts.h"
-#include "constants.h"
 #include <scsi/scsi_ioctl.h>
 
 /*

--- constants.h DELETED ---