diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-02-28 00:19:41 +0100 |
|---|---|---|
| committer |   Felipe Balbi <balbi@ti.com> | 2015-03-09 10:44:35 -0500 |
| commit | 1c390eb360c3f6bc9a06d2260eccad195c505de5 (patch) | |
| tree | 23bf44218845953f6d73ade7d7f2a8ce4391e0da /drivers/usb | |
| parent | usb: isp1760: fix possible deadlock in isp1760_udc_irq (diff) | |
| download | linux-dev-1c390eb360c3f6bc9a06d2260eccad195c505de5.tar.xz linux-dev-1c390eb360c3f6bc9a06d2260eccad195c505de5.zip | |
usb: musb: fix Kconfig regression
A recent bug fix I did that was marked for stable backports
introduced a slightly wrong dependency on CONFIG_OMAP_CONTROL_PHY.
I was missing the fact that the PHY driver already stubs out the
omap_control_usb_set_mode, and we only need to add a dependency
to prevent the musb-omap2430 driver from being built-in when
the phy driver is a loadable module, but we should not prevent it
from being built altogether when the phy driver is disabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: ca784be36cc725 ("usb: start using the control module driver")
Cc: <stable@vger.kernel.org> # v3.9+
Acked-by: Acked-by: Pavel Machek <pavel@ucw.cz>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 14e1628483d9..39db8b603627 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010 config USB_MUSB_OMAP2PLUS tristate "OMAP2430 and onwards" - depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY + depends on ARCH_OMAP2PLUS && USB + depends on OMAP_CONTROL_PHY || !OMAP_CONTROL_PHY select GENERIC_PHY config USB_MUSB_AM35X |