diff options
author | Michael Hanson <hansonorders@verizon.net> | 2011-02-01 03:42:19 (GMT) |
---|---|---|
committer | Michael Hanson <hansonorders@verizon.net> | 2011-02-01 03:42:19 (GMT) |
commit | 161ce75ef37b5e4b705f00d8e61d25ae8c3e9b3d (patch) | |
tree | e3ca8051dd5425db7cb7ad639d65a929819c1760 /abs/core/linux-api-headers/scsi.patch | |
parent | 346120bb7c2c5b9df8ef885bf67349da9f6c6c04 (diff) | |
parent | eae6f5c50c7e809a7fb9438277b96375f86fa5f6 (diff) | |
download | linhes_pkgbuild-161ce75ef37b5e4b705f00d8e61d25ae8c3e9b3d.zip linhes_pkgbuild-161ce75ef37b5e4b705f00d8e61d25ae8c3e9b3d.tar.gz linhes_pkgbuild-161ce75ef37b5e4b705f00d8e61d25ae8c3e9b3d.tar.bz2 |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/linux-api-headers/scsi.patch')
-rw-r--r-- | abs/core/linux-api-headers/scsi.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/abs/core/linux-api-headers/scsi.patch b/abs/core/linux-api-headers/scsi.patch deleted file mode 100644 index f85a3b7..0000000 --- a/abs/core/linux-api-headers/scsi.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h ---- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000 -+++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000 -@@ -145,14 +145,15 @@ - - /* 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 */ - }; - -+#ifdef __KERNEL__ - static inline unsigned - scsi_varlen_cdb_length(const void *hdr) - { -@@ -168,6 +169,7 @@ - return (cmnd[0] == VARIABLE_LENGTH_CMD) ? - scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]); - } -+#endif - - /* - * SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft -@@ -284,8 +286,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 |