diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/usb/storage/unusual_devs.h | |
parent | ALSA: hda - Avoid codec D3 for keeping mute LED up on Lenovo Yxx0 (diff) | |
parent | ALSA: hda - Add a fixup for HP Folio 13 mute LED (diff) | |
download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.zip |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
-rw-r--r-- | drivers/usb/storage/unusual_devs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index ad06255c2ade..adbeb255616a 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -1455,6 +1455,13 @@ UNUSUAL_DEV( 0x0f88, 0x042e, 0x0100, 0x0100, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_FIX_CAPACITY ), +/* Reported by Moritz Moeller-Herrmann <moritz-kernel@moeller-herrmann.de> */ +UNUSUAL_DEV( 0x0fca, 0x8004, 0x0201, 0x0201, + "Research In Motion", + "BlackBerry Bold 9000", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), + /* Reported by Michael Stattmann <michael@stattmann.com> */ UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x0000, "Sony Ericsson", |