--- zzzz-none-000/linux-2.6.32.61/include/scsi/scsi.h	2013-06-10 09:43:48.000000000 +0000
+++ virian-300e-630/linux-2.6.32.61/include/scsi/scsi.h	2010-04-08 11:00:21.000000000 +0000
@@ -145,10 +145,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 */
 };