summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_devinfo.c
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-07-30 07:59:19 (GMT)
committerJames Bottomley <JBottomley@Parallels.com>2014-07-30 07:59:19 (GMT)
commitf9e06c6904e5c48ea34e9734001e50b4c73837e4 (patch)
tree4deab81f705b1acd190087308027eb99db703203 /drivers/scsi/scsi_devinfo.c
parentcbf67842c3d9e7af8ccc031332b79e88d9cca592 (diff)
parent0213436a2cc5e4a5ca2fabfaa4d3877097f3b13f (diff)
downloadlinux-f9e06c6904e5c48ea34e9734001e50b4c73837e4.tar.xz
Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next
Diffstat (limited to 'drivers/scsi/scsi_devinfo.c')
-rw-r--r--drivers/scsi/scsi_devinfo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index f969aca..49014a1 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -222,6 +222,7 @@ static struct {
{"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+ {"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},
{"Promise", "", NULL, BLIST_SPARSELUN},
{"QUANTUM", "XP34301", "1071", BLIST_NOTQ},
{"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN},