diff options
author | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-08-19 16:42:01 -0700 |
commit | 312effedac183148411c965e20a62e73f23979f6 (patch) | |
tree | 81e466e84e7a2ebe9ee53e5d0963dc2d3c3f7356 /drivers/usb/storage/unusual_devs.h | |
parent | d3828df964e542533765b23f9a343657c7860e17 (diff) | |
parent | dbf7603a92cd895b8c1017734bc30fd9a32fd933 (diff) |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0linux-linaro-3.0-2011.08-0-android-1
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
-rw-r--r-- | drivers/usb/storage/unusual_devs.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index ccff3483eeb..3041a974faf 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -1988,6 +1988,16 @@ UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, "Micro Mini 1GB", USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), +/* + * Nick Bowler <nbowler@elliptictech.com> + * SCSI stack spams (otherwise harmless) error messages. + */ +UNUSUAL_DEV( 0xc251, 0x4003, 0x0100, 0x0100, + "Keil Software, Inc.", + "V2M MotherBoard", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_NOT_LOCKABLE), + /* Reported by Andrew Simmons <andrew.simmons@gmail.com> */ UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, "DataStor", |