diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 14:25:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 14:25:40 -0700 |
| commit | 0b2cad2f30d0353f2576b1a2207c0792ba713157 (patch) | |
| tree | 0d7f73fcc961111ddca915cc8f267ebb088a04c2 /drivers/block/scsi_ioctl.c | |
| parent | 238628edb6cd427454fb54994e2605e191bfc26a (diff) | |
| parent | 686579d95d48c713bdb7008cc76af8398219e687 (diff) | |
| download | op-kernel-dev-0b2cad2f30d0353f2576b1a2207c0792ba713157.zip op-kernel-dev-0b2cad2f30d0353f2576b1a2207c0792ba713157.tar.gz | |
Merge SCSI tree from James Bottomley.
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.
Diffstat (limited to 'drivers/block/scsi_ioctl.c')
| -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 689527a..681871c 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, 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, |
