fix build failures on include/scsi/scsi.h, spotted by udev compilation

SVN-Revision: 18230
15 years ago · 12d8c25efe
parent b624dec41b
commit 12d8c25efe
2 changed files with 34 additions and 0 deletions
--- a/target/linux/generic-2.6/patches-2.6.30/430-scsi_header_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/430-scsi_header_fix.patch
@ -0,0 +1,17 @@
+--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
+@@ -142,10 +142,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 */
+ };
--- a/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch
@ -0,0 +1,17 @@
+--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
+@@ -142,10 +142,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 */
+ };