diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-11-03 09:38:27 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-03 09:38:27 -0400 |
| commit | 4dc74c6feef1ea1524fb3943564d1c89b6f279c0 (patch) | |
| tree | 58ec0fdd970a8c9be8f258938bf1c7b07cd243b4 /drivers/usb/storage | |
| parent | 659aede3127731e7ec42c927d8a2d61deffeaf12 (diff) | |
| parent | 27d0858dbcf199838b8c50a3e94d397bf326d986 (diff) | |
Merge tag 'v3.0.50' into v3.0-rt
This is the 3.0.50 stable release
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 591f57fcf97d..fa8a1b2c42e8 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -1004,6 +1004,12 @@ UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9999, USB_SC_8070, USB_PR_CB, NULL, US_FL_NEED_OVERRIDE | US_FL_FIX_INQUIRY ), +/* Submitted by Oleksandr Chumachenko <ledest@gmail.com> */ +UNUSUAL_DEV( 0x07cf, 0x1167, 0x0100, 0x0100, + "Casio", + "EX-N1 DigitalCamera", + USB_SC_8070, USB_PR_DEVICE, NULL, 0), + /* Submitted by Hartmut Wahl <hwahl@hwahl.de>*/ UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001, "Samsung", |