diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-16 20:39:01 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-16 20:39:01 +0100 |
commit | c4df48a030c704352ce51b73a664ef4d6ff0d324 (patch) | |
tree | 097879c02ada3c89a3a976f0b6781f295c2e3478 /target/linux | |
parent | bb534316d8f79e60154b21a04cabec24bed69ba5 (diff) | |
parent | 339a86a351dffaa44ed3649b1eccb255fd860733 (diff) |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/patches/2.6.32/scsi-header.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/patches/2.6.32/scsi-header.patch b/target/linux/patches/2.6.32/scsi-header.patch deleted file mode 100644 index 9173b242d..000000000 --- a/target/linux/patches/2.6.32/scsi-header.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur linux-2.6.32.orig/include/scsi/Kbuild linux-2.6.32/include/scsi/Kbuild ---- linux-2.6.32.orig/include/scsi/Kbuild 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/include/scsi/Kbuild 2009-12-03 19:46:03.000000000 +0100 -@@ -1,3 +1,5 @@ -+header-y += sg.h -+header-y += scsi_ioctl.h - header-y += scsi.h - header-y += scsi_netlink.h - header-y += scsi_netlink_fc.h -diff -Nur linux-2.6.32.orig/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h ---- linux-2.6.32.orig/include/scsi/scsi.h 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/include/scsi/scsi.h 2009-12-03 19:47:49.000000000 +0100 -@@ -143,6 +143,8 @@ - - #define SCSI_MAX_VARLEN_CDB_SIZE 260 - -+#ifdef __KERNEL__ -+ - /* defined in T10 SCSI Primary Commands-2 (SPC2) */ - struct scsi_varlen_cdb_hdr { - u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ -@@ -169,6 +171,8 @@ - scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]); - } - -+#endif -+ - /* - * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft - * T10/1561-D Revision 4 Draft dated 7th November 2002. -@@ -284,8 +288,10 @@ - SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */ - }; - -+#ifdef __KERNEL__ - /* Returns a human-readable name for the device */ - extern const char * scsi_device_type(unsigned type); -+#endif - - /* - * standard mode-select header prepended to all mode-select commands |