[LV-commit] CVS: kernel-2.5/drivers/scsi scsi_ioctl.c,1.12,1.13

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

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

Modified Files:
	scsi_ioctl.c 
Log Message:
Merge with 2.5.67


Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scsi_ioctl.c	23 Aug 2003 12:44:06 -0000	1.12
+++ scsi_ioctl.c	27 Aug 2003 00:01:38 -0000	1.13
@@ -298,6 +298,7 @@
 		goto error;
 
 	switch (opcode) {
+	case SEND_DIAGNOSTIC:
 	case FORMAT_UNIT:
 		timeout = FORMAT_UNIT_TIMEOUT;
 		retries = 1;