Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index a45993026f36675739887eaa1167518af0cbeed7..0293752f74d5114d62c9545df0e845c7c1d92f1a 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -21,6 +21,7 @@ config USB_ARCH_HAS_HCD
        default y if USB_ARCH_HAS_EHCI
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
+       default y if BLACKFIN                           # SL-811
        default y if SUPERH                             # r8a66597-hcd
        default PCI
 
@@ -39,11 +40,13 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_PNX4008 && I2C
        default y if MFD_TC6393XB
        default y if ARCH_W90X900
+       default y if ARCH_DAVINCI_DA8XX
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
        # MIPS:
-       default y if SOC_AU1X00
+       default y if MIPS_ALCHEMY
+       default y if MACH_JZ4740
        # SH:
        default y if CPU_SUBTYPE_SH7720
        default y if CPU_SUBTYPE_SH7721
@@ -60,6 +63,8 @@ config USB_ARCH_HAS_EHCI
        default y if ARCH_IXP4XX
        default y if ARCH_W90X900
        default y if ARCH_AT91SAM9G45
+       default y if ARCH_MXC
+       default y if ARCH_OMAP3
        default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.