diff options
author | Ben Collins <bcollins@ubuntu.com> | 2007-05-26 06:06:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-06-08 19:24:30 -0400 |
commit | 67fa10627ec0d8aa16f1cf38cf527e67d8097d3c (patch) | |
tree | 3b866e96b24a2a021e97414affc818e0415dde76 /drivers/usb | |
parent | 01ee7d7032204b383b2fba73021e7acbc776184b (diff) |
USB: UNUSUAL_DEV: Sync up some reported devices from Ubuntu
UNUSUAL_DEV: Sync up some reported devices from Ubuntu
Various unusual dev entries accumulated from Ubuntu bug reports.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/storage/unusual_devs.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index d230ee72f9cd..54979c239c63 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -1179,8 +1179,8 @@ UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff, | |||
1179 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1179 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1180 | US_FL_FIX_INQUIRY ), | 1180 | US_FL_FIX_INQUIRY ), |
1181 | 1181 | ||
1182 | /* These are virtual windows driver CDs, which the zd1211rw driver automatically | 1182 | /* These are virtual windows driver CDs, which the zd1211rw driver |
1183 | * converts into a WLAN devices. */ | 1183 | * automatically converts into WLAN devices. */ |
1184 | UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, | 1184 | UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, |
1185 | "ZyXEL", | 1185 | "ZyXEL", |
1186 | "G-220F USB-WLAN Install", | 1186 | "G-220F USB-WLAN Install", |
@@ -1193,6 +1193,14 @@ UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101, | |||
1193 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1193 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1194 | US_FL_IGNORE_DEVICE ), | 1194 | US_FL_IGNORE_DEVICE ), |
1195 | 1195 | ||
1196 | /* SanDisk that has a second LUN for a driver ISO, reported by | ||
1197 | * Ben Collins <bcollins@ubuntu.com> */ | ||
1198 | UNUSUAL_DEV( 0x0781, 0x5406, 0x0000, 0xffff, | ||
1199 | "SanDisk", | ||
1200 | "U3 Cruzer Micro driver ISO", | ||
1201 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
1202 | US_FL_SINGLE_LUN ), | ||
1203 | |||
1196 | #ifdef CONFIG_USB_STORAGE_ISD200 | 1204 | #ifdef CONFIG_USB_STORAGE_ISD200 |
1197 | UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, | 1205 | UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, |
1198 | "ATI", | 1206 | "ATI", |
@@ -1271,6 +1279,15 @@ UNUSUAL_DEV( 0x0dd8, 0x1060, 0x0000, 0xffff, | |||
1271 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1279 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
1272 | US_FL_FIX_INQUIRY ), | 1280 | US_FL_FIX_INQUIRY ), |
1273 | 1281 | ||
1282 | /* Reported by Edward Chapman (taken from linux-usb mailing list) | ||
1283 | Netac OnlyDisk Mini U2CV2 512MB USB 2.0 Flash Drive */ | ||
1284 | UNUSUAL_DEV( 0x0dd8, 0xd202, 0x0000, 0x9999, | ||
1285 | "Netac", | ||
1286 | "USB Flash Disk", | ||
1287 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
1288 | US_FL_IGNORE_RESIDUE ), | ||
1289 | |||
1290 | |||
1274 | /* Patch by Stephan Walter <stephan.walter@epfl.ch> | 1291 | /* Patch by Stephan Walter <stephan.walter@epfl.ch> |
1275 | * I don't know why, but it works... */ | 1292 | * I don't know why, but it works... */ |
1276 | UNUSUAL_DEV( 0x0dda, 0x0001, 0x0012, 0x0012, | 1293 | UNUSUAL_DEV( 0x0dda, 0x0001, 0x0012, 0x0012, |