From 12d8c25efe29a418b11ab2ccfc1fcea81470549b Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 30 Oct 2009 16:24:20 +0000
Subject: [PATCH] fix build failures on include/scsi/scsi.h, spotted by udev
 compilation

SVN-Revision: 18230
---
 .../patches-2.6.30/430-scsi_header_fix.patch    | 17 +++++++++++++++++
 .../patches-2.6.31/430-scsi_header_fix.patch    | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 target/linux/generic-2.6/patches-2.6.30/430-scsi_header_fix.patch
 create mode 100644 target/linux/generic-2.6/patches-2.6.31/430-scsi_header_fix.patch

diff --git 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
new file mode 100644
index 000000000000..575bec92d76e
--- /dev/null
+++ 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 */
+ };
diff --git 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
new file mode 100644
index 000000000000..575bec92d76e
--- /dev/null
+++ 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 */
+ };
-- 
2.30.2