diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-18 15:33:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-18 15:33:09 -0700 |
| commit | 909eacd748b3c8d15e6a239aa67f7828885d798e (patch) | |
| tree | 87f88e6c53800a3f9b8cc0867845cf116c7416fe /drivers/usb/storage | |
| parent | aa519be34f45954f33a6c20430deac8e544a180f (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | linux-909eacd748b3c8d15e6a239aa67f7828885d798e.tar.gz | |
Merge 4.1-rc4 into usb-next
We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage')
| -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 d684b4b8108f..caf188800c67 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -766,6 +766,13 @@ UNUSUAL_DEV( 0x059f, 0x0643, 0x0000, 0x0000, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_GO_SLOW ), +/* Reported by Christian Schaller <cschalle@redhat.com> */ +UNUSUAL_DEV( 0x059f, 0x0651, 0x0000, 0x0000, + "LaCie", + "External HDD", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_NO_WP_DETECT ), + /* Submitted by Joel Bourquard <numlock@freesurf.ch> * Some versions of this device need the SubClass and Protocol overrides * while others don't. |