diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 12:50:08 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 12:50:08 -0500 |
commit | 6de7dc2c4c713d037c19aa1e310d240f16973414 (patch) | |
tree | 68963db8081e6ef18affd06cf2e9b00578ef874e /include/scsi/scsi.h | |
parent | cbc3d65ebcb0c494183d45cf202a53352cbf3871 (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) | |
download | linux-rt-6de7dc2c4c713d037c19aa1e310d240f16973414.tar.gz |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'include/scsi/scsi.h')
-rw-r--r-- | include/scsi/scsi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 1fb233741513..b361172b576c 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -28,7 +28,7 @@ extern const unsigned char scsi_command_size[8]; * SCSI device types */ -#define MAX_SCSI_DEVICE_CODE 14 +#define MAX_SCSI_DEVICE_CODE 15 extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; /* @@ -211,8 +211,8 @@ static inline int scsi_status_is_good(int status) * - treated as TYPE_DISK */ #define TYPE_MEDIUM_CHANGER 0x08 #define TYPE_COMM 0x09 /* Communications device */ -#define TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */ #define TYPE_RAID 0x0c +#define TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */ #define TYPE_RBC 0x0e #define TYPE_NO_LUN 0x7f |