aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-14 19:18:31 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-12-17 13:47:16 -0500
commite70e7690b66dc06fe2ad9058e696e18fe7f3faa6 (patch)
tree6526a3514805141d2c48ffc4f31f4abbd5aaf343 /drivers/usb/storage
parent565227c08226e458da191518251dbff6831624c2 (diff)
USB: revert portions of "UNUSUAL_DEV: Sync up some reported devices from Ubuntu"
This reverts one change from 67fa10627ec0d8aa16f1cf38cf527e67d8097d3c that prevented userspace from seing the "driver disk" lun in a san disk device. The kernel shouldn't do this, it's up to userspace to handle this properly, if it somehow wants to filter this away. Cc: Ben Collins <bcollins@ubuntu.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Phil Dibowitz <phil@ipom.com> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Cc: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/unusual_devs.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 7bbfd31a9645..6d6108b3993b 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1265,14 +1265,6 @@ UNUSUAL_DEV( 0x0ace, 0x20ff, 0x0101, 0x0101,
1265 US_SC_DEVICE, US_PR_DEVICE, NULL, 1265 US_SC_DEVICE, US_PR_DEVICE, NULL,
1266 US_FL_IGNORE_DEVICE ), 1266 US_FL_IGNORE_DEVICE ),
1267 1267
1268/* SanDisk that has a second LUN for a driver ISO, reported by
1269 * Ben Collins <bcollins@ubuntu.com> */
1270UNUSUAL_DEV( 0x0781, 0x5406, 0x0000, 0xffff,
1271 "SanDisk",
1272 "U3 Cruzer Micro driver ISO",
1273 US_SC_DEVICE, US_PR_DEVICE, NULL,
1274 US_FL_SINGLE_LUN ),
1275
1276#ifdef CONFIG_USB_STORAGE_ISD200 1268#ifdef CONFIG_USB_STORAGE_ISD200
1277UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, 1269UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
1278 "ATI", 1270 "ATI",