Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / scsi / scsi_devinfo.h

diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 599966898208a489ef9014d0cc869def7f8b772b..b4ddd3b18b4c1619fb7c7d9b4c484ed0bca89b2b 100644 (file)
--- 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