Commit 1c390eb3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Felipe Balbi

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: ca784be3 ("usb: start using the control module driver")
Cc: <stable@vger.kernel.org> # v3.9+
Acked-by: default avatarAcked-by: Pavel Machek <pavel@ucw.cz>
Tested-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 79852397
...@@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010 ...@@ -79,7 +79,8 @@ config USB_MUSB_TUSB6010
config USB_MUSB_OMAP2PLUS config USB_MUSB_OMAP2PLUS
tristate "OMAP2430 and onwards" 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 select GENERIC_PHY
config USB_MUSB_AM35X config USB_MUSB_AM35X
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment