[LV-k25-commit] kernel-2.5/drivers/block scsi_ioctl.c,1.4,1.5

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

Update of /cvsroot/linux-vax/kernel-2.5/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24474/drivers/block

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

Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/block/scsi_ioctl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- scsi_ioctl.c	27 Mar 2005 23:46:46 -0000	1.4
+++ scsi_ioctl.c	24 Jul 2005 21:33:11 -0000	1.5
@@ -328,11 +328,6 @@
 	return 0;
 }
 
-#define FORMAT_UNIT_TIMEOUT		(2 * 60 * 60 * HZ)
-#define START_STOP_TIMEOUT		(60 * HZ)
-#define MOVE_MEDIUM_TIMEOUT		(5 * 60 * HZ)
-#define READ_ELEMENT_STATUS_TIMEOUT	(5 * 60 * HZ)
-#define READ_DEFECT_DATA_TIMEOUT	(60 * HZ )
 #define OMAX_SB_LEN 16          /* For backward compatibility */
 
 static int sg_scsi_ioctl(struct file *file, request_queue_t *q,