lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ../scsi-rc-fixes-2.6

Browse Source 
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>
This commit is contained in:
James Bottomley
2006-04-14 15:47:45 -05:00
parent 5bb0b55a32 7676f83aeb
commit 84d891d672
43 changed files with 1096 additions and 13267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/scsi/scsi_devinfo.h
View File

@@ -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