From: James Bottomley Date: Fri, 14 Apr 2006 20:47:45 +0000 (-0500) Subject: Merge ../scsi-rc-fixes-2.6 X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=84d891d6727c17832c79ec96d3d107a87d857978;p=linux-edison.git 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 --- 84d891d6727c17832c79ec96d3d107a87d857978 diff --cc include/scsi/scsi_devinfo.h index 59996689820,d31b16d25a0..b4ddd3b18b4 --- a/include/scsi/scsi_devinfo.h +++ b/include/scsi/scsi_devinfo.h @@@ -28,5 -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