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/scsi/scsi_priv.h | |
| parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
| parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) | |
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
| -rw-r--r-- | drivers/scsi/scsi_priv.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index aca3b39fe710..c01580df4476 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h | |||
| @@ -30,11 +30,6 @@ struct Scsi_Host; | |||
| 30 | #define SCSI_REQ_MAGIC 0x75F6D354 | 30 | #define SCSI_REQ_MAGIC 0x75F6D354 |
| 31 | 31 | ||
| 32 | /* | 32 | /* |
| 33 | * Flag bit for the internal_timeout array | ||
| 34 | */ | ||
| 35 | #define NORMAL_TIMEOUT 0 | ||
| 36 | |||
| 37 | /* | ||
| 38 | * Scsi Error Handler Flags | 33 | * Scsi Error Handler Flags |
| 39 | */ | 34 | */ |
| 40 | #define scsi_eh_eflags_chk(scp, flags) \ | 35 | #define scsi_eh_eflags_chk(scp, flags) \ |