diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /drivers/scsi/scsi_devinfo.c | |
| parent | 17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff) | |
| parent | ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff) | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
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 07b554affcf2..64fc9e21f35b 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c | |||
| @@ -110,6 +110,7 @@ static struct { | |||
| 110 | {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */ | 110 | {"RELISYS", "Scorpio", NULL, BLIST_NOLUN}, /* responds to all lun */ |
| 111 | {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */ | 111 | {"SANKYO", "CP525", "6.64", BLIST_NOLUN}, /* causes failed REQ SENSE, extra reset */ |
| 112 | {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN}, | 112 | {"TEXEL", "CD-ROM", "1.06", BLIST_NOLUN}, |
| 113 | {"transtec", "T5008", "0001", BLIST_NOREPORTLUN }, | ||
| 113 | {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */ | 114 | {"YAMAHA", "CDR100", "1.00", BLIST_NOLUN}, /* locks up */ |
| 114 | {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */ | 115 | {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */ |
| 115 | {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN}, /* locks up */ | 116 | {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN}, /* locks up */ |