Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

2a8d9cdc · James Bottomley · 90a88d6e · fb2d65d2 · 2a8d9cdc
Commit 2a8d9cdc authored Feb 11, 2016 by James Bottomley
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/scsi/scsi_devinfo.c drivers/scsi/scsi_devinfo.c +1 -0

No files found.
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -206,6 +206,7 @@ static struct {
 	{"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
 	{"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN},
 	{"Marvell", "Console", NULL, BLIST_SKIP_VPD_PAGES},
+	{"Marvell", "91xx Config", "1.01", BLIST_SKIP_VPD_PAGES},
 	{"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
 	{"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
 	{"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},