diff options
| author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-03-10 06:33:11 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-19 10:24:22 -0400 |
| commit | 7f56cfd253d929c06ce4ed5bfb99a8c6805075c9 (patch) | |
| tree | 8e0fffeb95ae6e8dc091f7822875e07c31c1d67b /drivers/usb | |
| parent | 83ba11d93434e6f0cc2e060336b0b19a3f687fa3 (diff) | |
USB: Remove last bit of CONFIG_USB_BERRY_CHARGE
One last bit was missed while removing the USB_BERRY_CHARGE config
option in a8d4211f33a9573f7b1bdcfd9c9c48631d1515ee which gets dropped
by this patch.
Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 61c8b9df96e6..ccf1dbbb87ef 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -1389,20 +1389,6 @@ UNUSUAL_DEV( 0x0f19, 0x0105, 0x0100, 0x0100, | |||
| 1389 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 1389 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1390 | US_FL_IGNORE_RESIDUE ), | 1390 | US_FL_IGNORE_RESIDUE ), |
| 1391 | 1391 | ||
| 1392 | /* Jeremy Katz <katzj@redhat.com>: | ||
| 1393 | * The Blackberry Pearl can run in two modes; a usb-storage only mode | ||
| 1394 | * and a mode that allows access via mass storage and to its database. | ||
| 1395 | * The berry_charge module will set the device to dual mode and thus we | ||
| 1396 | * should ignore its native mode if that module is built | ||
| 1397 | */ | ||
| 1398 | #ifdef CONFIG_USB_BERRY_CHARGE | ||
| 1399 | UNUSUAL_DEV( 0x0fca, 0x0006, 0x0001, 0x0001, | ||
| 1400 | "RIM", | ||
| 1401 | "Blackberry Pearl", | ||
| 1402 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 1403 | US_FL_IGNORE_DEVICE ), | ||
| 1404 | #endif | ||
| 1405 | |||
| 1406 | /* Reported by Michael Stattmann <michael@stattmann.com> */ | 1392 | /* Reported by Michael Stattmann <michael@stattmann.com> */ |
| 1407 | UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, | 1393 | UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, |
| 1408 | "Sony Ericsson", | 1394 | "Sony Ericsson", |
