diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2004-01-14 23:12:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2004-01-14 23:12:42 -0800 |
| commit | 6352cda2b95733668737c4a46679fd96d9948bc3 (patch) | |
| tree | 03b8159915a2db61c7bb443456e234dd667b83d8 /include | |
| parent | c272dd4672c7b0d2b20f84acb965f1b61694a601 (diff) | |
| parent | 477552e452dab29884eb4dda34de4f2f586fe1f1 (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.6
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 55250d85e2c0..8cbd95d04f3a 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -302,7 +302,7 @@ struct scsi_lun { #define QUEUED 0x2004 #define SOFT_ERROR 0x2005 #define ADD_TO_MLQUEUE 0x2006 -#define TIMEOUT 0x2007 +#define TIMEOUT_ERROR 0x2007 /* * Midlevel queue return values. |