aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-07-30 00:59:19 -0700
committerJames Bottomley <JBottomley@Parallels.com>2014-07-30 00:59:19 -0700
commitf9e06c6904e5c48ea34e9734001e50b4c73837e4 (patch)
tree4deab81f705b1acd190087308027eb99db703203 /include/scsi
parentscsi_debug: support scsi-mq, queues and locks (diff)
parentscsi: do not issue SCSI RSOC command to Promise Vtrak E610f (diff)
downloadlinux-dev-f9e06c6904e5c48ea34e9734001e50b4c73837e4.tar.xz
linux-dev-f9e06c6904e5c48ea34e9734001e50b4c73837e4.zip
Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_devinfo.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 1fdd6fc5492b..183eaab7c380 100644
--- 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