diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:50:33 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:50:33 -0500 |
| commit | 2226340eb8df9c42f9fca74582d08d5117fc0cec (patch) | |
| tree | c98370844715194600b79f886dbc391633f3e470 /drivers/usb/storage | |
| parent | 2e06cb5859fdaeba0529806eb1bf161ffd0db201 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 0a9858f69a9b..f5f47a34b168 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -1118,6 +1118,15 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999, | |||
| 1118 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1118 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1119 | US_FL_GO_SLOW ), | 1119 | US_FL_GO_SLOW ), |
| 1120 | 1120 | ||
| 1121 | /* | ||
| 1122 | * David Härdeman <david@2gen.com> | ||
| 1123 | * The key makes the SCSI stack print confusing (but harmless) messages | ||
| 1124 | */ | ||
| 1125 | UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, | ||
| 1126 | "Iomega", | ||
| 1127 | "Micro Mini 1GB", | ||
| 1128 | US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), | ||
| 1129 | |||
| 1121 | #ifdef CONFIG_USB_STORAGE_SDDR55 | 1130 | #ifdef CONFIG_USB_STORAGE_SDDR55 |
| 1122 | UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999, | 1131 | UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999, |
| 1123 | "Sandisk", | 1132 | "Sandisk", |