usb: musb: add omap-control dependency
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Jan 2015 21:51:04 +0000 (22:51 +0100)
committerFelipe Balbi <balbi@ti.com>
Thu, 29 Jan 2015 16:36:29 +0000 (10:36 -0600)
The omap musb front-end calls into the phy driver directly
instead of using a generic phy interface, which causes a link
error when the specific driver is not built-in:

drivers/built-in.o: In function `omap2430_musb_disable':
usb/musb/omap2430.c:480: undefined reference to `omap_control_usb_set_mode'
drivers/built-in.o: In function `omap2430_musb_enable':
usb/musb/omap2430.c:466: undefined reference to `omap_control_usb_set_mode'
usb/musb/omap2430.c:447: undefined reference to `omap_control_usb_set_mode'
drivers/built-in.o: In function `omap_musb_set_mailbox':
usb/musb/omap2430.c:273: undefined reference to `omap_control_usb_set_mode'
usb/musb/omap2430.c:304: undefined reference to `omap_control_usb_set_mode'
drivers/built-in.o:(.debug_addr+0xbd9e0): more undefined references to `omap_control_usb_set_mode' follow

This adds an explicit dependency.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: ca784be36cc725 ("usb: start using the control module driver")
Cc: <stable@vger.kernel.org> # v3.9+
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/Kconfig

index 26c835f1b7263200a4c140e1e8cceaf34b0b5217..14e1628483d9427a68b83f09e18bee8c735e4364 100644 (file)
@@ -79,7 +79,7 @@ config USB_MUSB_TUSB6010
 
 config USB_MUSB_OMAP2PLUS
        tristate "OMAP2430 and onwards"
-       depends on ARCH_OMAP2PLUS && USB
+       depends on ARCH_OMAP2PLUS && USB && OMAP_CONTROL_PHY
        select GENERIC_PHY
 
 config USB_MUSB_AM35X