diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 16:48:12 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 16:48:12 -0400 |
| commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
| tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /include | |
| parent | 24c20f10583647e30afe87b6f6d5e14bc7b1cbc6 (diff) | |
| parent | e785060ea3a1c8e37a8bc1449c79e36bff2b5b13 (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 261e708010da..d17178e6fcdd 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h | |||
| @@ -333,6 +333,7 @@ static inline int scsi_status_is_good(int status) | |||
| 333 | #define TYPE_RBC 0x0e | 333 | #define TYPE_RBC 0x0e |
| 334 | #define TYPE_OSD 0x11 | 334 | #define TYPE_OSD 0x11 |
| 335 | #define TYPE_ZBC 0x14 | 335 | #define TYPE_ZBC 0x14 |
| 336 | #define TYPE_WLUN 0x1e /* well-known logical unit */ | ||
| 336 | #define TYPE_NO_LUN 0x7f | 337 | #define TYPE_NO_LUN 0x7f |
| 337 | 338 | ||
| 338 | /* SCSI protocols; these are taken from SPC-3 section 7.5 */ | 339 | /* SCSI protocols; these are taken from SPC-3 section 7.5 */ |