--- /usr/include/scsi/scsi.h    2009-07-15 11:00:17.897425654 +0200
+++ /usr/include/scsi/scsi.h.patched    2009-07-15 11:00:08.305425688 +0200
@@ -142,10 +142,10 @@
 
 /* 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 */
 };