Commit 7f56cfd253d929c06ce4ed5bfb99a8c6805075c9
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
83ba11d934
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 0 additions and 14 deletions Side-by-side Diff
drivers/usb/storage/unusual_devs.h
| ... | ... | @@ -1389,20 +1389,6 @@ |
| 1389 | 1389 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 1390 | 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 | 1392 | /* Reported by Michael Stattmann <michael@stattmann.com> */ |
| 1407 | 1393 | UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, |
| 1408 | 1394 | "Sony Ericsson", |