Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mirror_ubuntu-zesty-kernel.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index dcd49f1e96d006d1abb04271687d90f0f52a9ef5..240750881d28d0a8c2d5c3d5a10312c701afe83b 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -22,7 +22,6 @@ config USB_ARCH_HAS_HCD
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
        default y if SUPERH                             # r8a66597-hcd
-       default y if MICROBLAZE
        default PCI
 
 # many non-PCI SOC chips embed OHCI
@@ -39,6 +38,7 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_AT91
        default y if ARCH_PNX4008 && I2C
        default y if MFD_TC6393XB
+       default y if ARCH_W90X900
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@ -58,6 +58,8 @@ config USB_ARCH_HAS_EHCI
        default y if PPC_83xx
        default y if SOC_AU1200
        default y if ARCH_IXP4XX
+       default y if ARCH_W90X900
+       default y if ARCH_AT91SAM9G45
        default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.