diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2014-06-18 17:49:18 +0100 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2014-06-18 17:49:18 +0100 |
| commit | d6b3490cbb8dcd4eb33c52c4824ece929395d2a0 (patch) | |
| tree | cb17585597482028a01fdd056f3afc328cc89b77 /drivers/usb/host/Kconfig | |
| parent | 2d9d90ddf52cbc555767b0ccf7ba3840c4e42bba (diff) | |
| parent | b8cad0ef892705f58fffb2351784f6ca497e3afd (diff) | |
Merge branch 'tracking-qcomlt-usb' into integration-linux-qcomltqcomlt-v3.16-rc1
* tracking-qcomlt-usb:
usb: phy: msm: Do not do runtime pm if the phy is not idle
usb: phy: msm: Make phy_reset clk and reset line optional.
usb: Kconfig: make EHCI_MSM selectable for QCOM SOCs
Diffstat (limited to 'drivers/usb/host/Kconfig')
| -rw-r--r-- | drivers/usb/host/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 61b7817bd66b..03314f861bee 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -176,7 +176,7 @@ config USB_EHCI_HCD_AT91 config USB_EHCI_MSM tristate "Support for Qualcomm QSD/MSM on-chip EHCI USB controller" - depends on ARCH_MSM + depends on ARCH_MSM || ARCH_QCOM select USB_EHCI_ROOT_HUB_TT ---help--- Enables support for the USB Host controller present on the |