diff options
| author | James Bottomley <jejb@titanic> | 2005-04-18 14:45:00 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 14:45:00 -0400 |
| commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
| tree | 284912295d46a861930d0619788a650f56c2a29b /drivers/block | |
| parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
| parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) | |
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/scsi_ioctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c index 689527a89de7..681871ca5d60 100644 --- a/drivers/block/scsi_ioctl.c +++ b/drivers/block/scsi_ioctl.c | |||
| @@ -328,11 +328,6 @@ static int sg_io(struct file *file, request_queue_t *q, | |||
| 328 | return 0; | 328 | return 0; |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | #define FORMAT_UNIT_TIMEOUT (2 * 60 * 60 * HZ) | ||
| 332 | #define START_STOP_TIMEOUT (60 * HZ) | ||
| 333 | #define MOVE_MEDIUM_TIMEOUT (5 * 60 * HZ) | ||
| 334 | #define READ_ELEMENT_STATUS_TIMEOUT (5 * 60 * HZ) | ||
| 335 | #define READ_DEFECT_DATA_TIMEOUT (60 * HZ ) | ||
| 336 | #define OMAX_SB_LEN 16 /* For backward compatibility */ | 331 | #define OMAX_SB_LEN 16 /* For backward compatibility */ |
| 337 | 332 | ||
| 338 | static int sg_scsi_ioctl(struct file *file, request_queue_t *q, | 333 | static int sg_scsi_ioctl(struct file *file, request_queue_t *q, |