diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-05 08:37:52 +0300 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-05 08:37:52 +0300 |
commit | 12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6 (patch) | |
tree | b8fe38b24a2070d5b0cb2279f86e98b6dce98c46 /drivers/scsi/scsi_devinfo.c | |
parent | 6344a5cd3e8acf6e9823046cebd00b16faacdb1a (diff) | |
parent | 0fb5b1fb30fba3671dd5b1489d78e93e08d62e4e (diff) | |
download | linux-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.tar.xz |
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/scsi_devinfo.c')
-rw-r--r-- | drivers/scsi/scsi_devinfo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index 47b9d13f97b8..da2e068ee47d 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -205,6 +205,7 @@ static struct { {"Intel", "Multi-Flex", NULL, BLIST_NO_RSOC}, {"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}, {"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}, |