Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next

2014-07-30 00:59:19 -07:00
parent cbf67842c3 0213436a2c
commit f9e06c6904
4 changed files with 11 additions and 2 deletions
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -35,4 +35,6 @@
 #define BLIST_SCSI3LUN		0x8000000 /* Scan more than 256 LUNs
 					     for sequential scan */
 #define BLIST_TRY_VPD_PAGES	0x10000000 /* Attempt to read VPD pages */
+#define BLIST_NO_RSOC		0x20000000 /* don't try to issue RSOC */
+
 #endif