From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Apr 2013 17:29:01 +0000 (+0200)
Subject: USB: ehci-msm: USB_MSM_OTG needs USB_PHY
X-Git-Tag: Ubuntu-5.2.0-15.16~15860^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4626b8daf9bb00ce6b4d533c1a155211ad880f32;p=mirror_ubuntu-eoan-kernel.git

USB: ehci-msm: USB_MSM_OTG needs USB_PHY

The Kconfig entry for USB_EHCI_MSM unconditionally selects USB_MSM_OTG,
which is now only visible when USB_PHY is also enabled.

This adds an appropriate dependency and enables USB_PHY in the msm
defconfig, avoiding the Kbuild warning:

warning: (USB_EHCI_MSM) selects USB_MSM_OTG which has unmet direct dependencies (USB_SUPPORT && USB_PHY && (USB || USB_GADGET) && ARCH_MSM)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index c558472036b6..de94f2699063 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -188,6 +188,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 USB_PHY
 	select USB_EHCI_ROOT_HUB_TT
 	select USB_MSM_OTG
 	---help---