diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 01:58:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 01:58:29 -0500 |
| commit | 8f4bf4bcc4d6f70a47baec5d73bd411e572842e0 (patch) | |
| tree | 8ed86ebd19c32a629bfcfb43378bf32acd14c7d6 /drivers/usb/core/quirks.c | |
| parent | 1ed39bac21c3c2934b18de34df9478ad7b8edf1f (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/core/quirks.c')
| -rw-r--r-- | drivers/usb/core/quirks.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 0ffb4ed0a945..41e510ae8c83 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
| @@ -179,6 +179,10 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
| 179 | { USB_DEVICE(0x0b05, 0x17e0), .driver_info = | 179 | { USB_DEVICE(0x0b05, 0x17e0), .driver_info = |
| 180 | USB_QUIRK_IGNORE_REMOTE_WAKEUP }, | 180 | USB_QUIRK_IGNORE_REMOTE_WAKEUP }, |
| 181 | 181 | ||
| 182 | /* Protocol and OTG Electrical Test Device */ | ||
| 183 | { USB_DEVICE(0x1a0a, 0x0200), .driver_info = | ||
| 184 | USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, | ||
| 185 | |||
| 182 | { } /* terminating entry must be last */ | 186 | { } /* terminating entry must be last */ |
| 183 | }; | 187 | }; |
| 184 | 188 | ||
