diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-07-25 21:49:36 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-07-25 21:49:36 +0200 |
commit | c84d53051fcb4f3d14d5a245e1d7ee8512bcb199 (patch) | |
tree | 30f7f845afc8e0428c1fbb1bc93f52b120d40661 /drivers/scsi/scsi_devinfo.c | |
parent | 9a71df495c3d29dab596bb590e73fd8b20106e2d (diff) | |
parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
download | kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.gz kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.bz2 kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.zip |
Merge tag 'v5.8-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 eed31021e788..ba84244c1b4f 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -239,6 +239,7 @@ static struct { {"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, + {"FUJITSU", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"SanDisk", "Cruzer Blade", NULL, BLIST_TRY_VPD_PAGES | BLIST_INQUIRY_36}, {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36}, |