diff options
| author | Greg Kroah-Hartman | 2013-05-27 04:00:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-05-27 04:00:52 +0200 |
| commit | 45f6bc5ff9c3387387f048ec85dcb4e69acf0b03 (patch) | |
| tree | d04952bb05b53a362bcd165fb910c5c1441b4c5d /drivers/usb/core | |
| parent | usb: uwb: use correct locking calls for rc data (diff) | |
| parent | Linux 3.10-rc3 (diff) | |
| download | kernel-qcow2-linux-45f6bc5ff9c3387387f048ec85dcb4e69acf0b03.tar.gz kernel-qcow2-linux-45f6bc5ff9c3387387f048ec85dcb4e69acf0b03.tar.xz kernel-qcow2-linux-45f6bc5ff9c3387387f048ec85dcb4e69acf0b03.zip | |
Merge 3.10-rc3 into usb-next
We want these fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/core/quirks.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 8772b3659296..db535b0aa172 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -51,7 +51,7 @@ config USB_DYNAMIC_MINORS config USB_OTG bool "OTG support" - depends on USB_SUSPEND + depends on PM_RUNTIME default n help The most notable feature of USB OTG is support for a diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index ab5638d9c707..a63598895077 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -88,6 +88,9 @@ static const struct usb_device_id usb_quirk_list[] = { /* Edirol SD-20 */ { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Alcor Micro Corp. Hub */ + { USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME }, + /* appletouch */ { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, |