Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[sfrench/cifs-2.6.git] / include / scsi / scsi.h

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 9ae5c613131ba8537933adfc616132a66ea7a698..8fcb6e0e9e720193dda04134e82182e547fcfa68 100644 (file)
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -151,10 +151,10 @@ struct scsi_cmnd;
 
 /* defined in T10 SCSI Primary Commands-2 (SPC2) */
 struct scsi_varlen_cdb_hdr {
-       u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-       u8 control;
-       u8 misc[5];
-       u8 additional_cdb_length;         /* total cdb length - 8 */
+       __u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+       __u8 control;
+       __u8 misc[5];
+       __u8 additional_cdb_length;         /* total cdb length - 8 */
        __be16 service_action;
        /* service specific data follows */
 };