diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /include/scsi/scsi.h | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/scsi/scsi.h')
| -rw-r--r-- | include/scsi/scsi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 9ae5c613131b..8fcb6e0e9e72 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h | |||
| @@ -151,10 +151,10 @@ struct scsi_cmnd; | |||
| 151 | 151 | ||
| 152 | /* defined in T10 SCSI Primary Commands-2 (SPC2) */ | 152 | /* defined in T10 SCSI Primary Commands-2 (SPC2) */ |
| 153 | struct scsi_varlen_cdb_hdr { | 153 | struct scsi_varlen_cdb_hdr { |
| 154 | u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ | 154 | __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ |
| 155 | u8 control; | 155 | __u8 control; |
| 156 | u8 misc[5]; | 156 | __u8 misc[5]; |
| 157 | u8 additional_cdb_length; /* total cdb length - 8 */ | 157 | __u8 additional_cdb_length; /* total cdb length - 8 */ |
| 158 | __be16 service_action; | 158 | __be16 service_action; |
| 159 | /* service specific data follows */ | 159 | /* service specific data follows */ |
| 160 | }; | 160 | }; |