summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-09-16 09:24:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-16 16:29:41 +0200
commited3d6d0ac036bcff6e4649a6f8fb987bb4e34444 (patch)
tree4c950d1b1aa356e6dc021f1431631853267178fe /drivers/usb
parent9395452b4aab7bc2475ef8935b4a4fb99d778d70 (diff)
downloadlinux-stable-ed3d6d0ac036bcff6e4649a6f8fb987bb4e34444.tar.gz
linux-stable-ed3d6d0ac036bcff6e4649a6f8fb987bb4e34444.tar.bz2
linux-stable-ed3d6d0ac036bcff6e4649a6f8fb987bb4e34444.zip
usb: musb: Fix tusb6010 compile error on blackfin
We have CONFIG_BLACKFIN ifdef redefining all musb registers in musb_regs.h and tusb6010.h is never included causing a build error with blackfin-allmodconfig and COMPILE_TEST. Let's fix the issue by not building tusb6010 if CONFIG_BLACKFIN is selected. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-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 886526b5fcdd..73cfa13fc0dc 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -87,7 +87,7 @@ config USB_MUSB_DA8XX
config USB_MUSB_TUSB6010
tristate "TUSB6010"
depends on HAS_IOMEM
- depends on ARCH_OMAP2PLUS || COMPILE_TEST
+ depends on (ARCH_OMAP2PLUS || COMPILE_TEST) && !BLACKFIN
depends on NOP_USB_XCEIV = USB_MUSB_HDRC # both built-in or both modules
config USB_MUSB_OMAP2PLUS