summaryrefslogtreecommitdiff
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-19 10:12:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-19 10:12:41 +0300
commitc51f2ff0075b77f272da93b7155aa666a77c8fe7 (patch)
treef229265a8d4b0407f2eaaa4fb6d1afb86ac380c5 /drivers/usb/musb
parenteddde288957957d45c42fcf51af9a059de7e0887 (diff)
parent3be7988674ab33565700a37b210f502563d932e6 (diff)
downloadlinux-c51f2ff0075b77f272da93b7155aa666a77c8fe7.tar.xz
Merge 4.8-rc7 into usb-next
We want/need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb')
-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 c73221a819c8..72a2a5040848 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