summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-08 15:52:15 +0200
committerFelipe Balbi <balbi@ti.com>2014-05-14 09:23:31 -0500
commit70c1ff4b3c865a36f00aa2498eab3eadd818e4ab (patch)
tree65f4a0678361bd554ba126893b4cee608693ee4a
parent64890edb8536618ee856fbca699fe930fcef1573 (diff)
downloadtalos-op-linux-70c1ff4b3c865a36f00aa2498eab3eadd818e4ab.tar.gz
talos-op-linux-70c1ff4b3c865a36f00aa2498eab3eadd818e4ab.zip
usb: musb: tusb-dma can't be built-in if tusb is not
A configuration with CONFIG_USB_MUSB_HDRC=y, CONFIG_USB_TUSB_OMAP_DMA=y and CONFIG_USB_MUSB_TUSB6010=m causes a link failure because of the dependency on the tusb_get_revision symbol: (.text+0x154ce8): undefined reference to `tusb_get_revision' This patch ensures that either MUSB_HDRC and MUSB_TUSB6010 are both modules or both built-in, which are the valid configurations. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: linux-omap@vger.kernel.org Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/musb/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 6b2a4b8b82ca..e0fba7591dea 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -145,7 +145,7 @@ config USB_TI_CPPI41_DMA
config USB_TUSB_OMAP_DMA
bool 'TUSB 6010'
- depends on USB_MUSB_TUSB6010
+ depends on USB_MUSB_TUSB6010 = USB_MUSB_HDRC # both built-in or both modules
depends on ARCH_OMAP
help
Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
OpenPOWER on IntegriCloud