Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 63436892688c04ca070d8e4574337d2babbedc80..142a37179024616921c74c15a129907a55da3d40 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 SUPERH                             # r8a66597-hcd
        default PCI
 
 # many non-PCI SOC chips embed OHCI
@@ -32,6 +33,7 @@ config USB_ARCH_HAS_OHCI
        default y if ARCH_LH7A404
        default y if ARCH_S3C2410
        default y if PXA27x
+       default y if PXA3xx
        default y if ARCH_EP93XX
        default y if ARCH_AT91
        default y if ARCH_PNX4008
@@ -40,6 +42,10 @@ config USB_ARCH_HAS_OHCI
        default y if PPC_MPC52xx
        # MIPS:
        default y if SOC_AU1X00
+       # SH:
+       default y if CPU_SUBTYPE_SH7720
+       default y if CPU_SUBTYPE_SH7721
+       default y if CPU_SUBTYPE_SH7763
        # more:
        default PCI
 
@@ -48,6 +54,8 @@ config USB_ARCH_HAS_EHCI
        boolean
        default y if PPC_83xx
        default y if SOC_AU1200
+       default y if ARCH_IXP4XX
+       default y if ARCH_OMAP34XX
        default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
@@ -90,6 +98,8 @@ source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/host/Kconfig"
 
+source "drivers/usb/musb/Kconfig"
+
 source "drivers/usb/class/Kconfig"
 
 source "drivers/usb/storage/Kconfig"