summaryrefslogtreecommitdiffstats
path: root/include/scsi/scsi_devinfo.h
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-04-14 15:47:45 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-04-14 15:47:45 -0500
commit84d891d6727c17832c79ec96d3d107a87d857978 (patch)
treea189a4d00c1387e409e2f9808c72c8088728c33b /include/scsi/scsi_devinfo.h
parent5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 (diff)
parent7676f83aeb774e7a3abe6af06ec92b29488b5b79 (diff)
downloadop-kernel-dev-84d891d6727c17832c79ec96d3d107a87d857978.zip
op-kernel-dev-84d891d6727c17832c79ec96d3d107a87d857978.tar.gz
Merge ../scsi-rc-fixes-2.6
Conflicts: include/scsi/scsi_devinfo.h Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3 Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi/scsi_devinfo.h')
-rw-r--r--include/scsi/scsi_devinfo.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 5999668..b4ddd3b 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -28,5 +28,6 @@
#define BLIST_NO_ULD_ATTACH 0x100000 /* device is actually for RAID config */
#define BLIST_SELECT_NO_ATN 0x200000 /* select without ATN */
#define BLIST_RETRY_HWERROR 0x400000 /* retry HARDWARE_ERROR */
-#define BLIST_ATTACH_PQ3 0x800000 /* Scan: Attach to PQ3 devices */
+#define BLIST_MAX_512 0x800000 /* maximum 512 sector cdb length */
+#define BLIST_ATTACH_PQ3 0x1000000 /* Scan: Attach to PQ3 devices */
#endif
OpenPOWER on IntegriCloud