lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../scsi-misc-2.6

Browse Source 
Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2006-07-03 09:41:12 -05:00
parent 29454dde27 d6b0c53723
commit c4e00fac42
74 changed files with 4528 additions and 2890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/scsi_priv.h
View File

@@ -116,7 +116,7 @@ extern struct bus_type scsi_bus_type;
* classes.
*/
#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT (HZ*60)
#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT 600 /* units in seconds */
extern int scsi_internal_device_block(struct scsi_device *sdev);
extern int scsi_internal_device_unblock(struct scsi_device *sdev);