mfd: Rename twl5031 sih modules

[safe/jmp/linux-2.6] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 3be4730..6a58cb1 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
 
@@ -38,6 +39,8 @@ 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
+       default y if ARCH_DAVINCI_DA8XX
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@ -47,6 +50,7 @@ config USB_ARCH_HAS_OHCI
        default y if CPU_SUBTYPE_SH7720
        default y if CPU_SUBTYPE_SH7721
        default y if CPU_SUBTYPE_SH7763
+       default y if CPU_SUBTYPE_SH7786
        # more:
        default PCI
 
@@ -56,12 +60,17 @@ 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 y if ARCH_MXC
+       default y if ARCH_OMAP3
        default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
        tristate "Support for Host-side USB"
        depends on USB_ARCH_HAS_HCD
+       select NLS  # for UTF-8 strings
        ---help---
          Universal Serial Bus (USB) is a specification for a serial bus
          subsystem which offers higher speeds and more features than the
@@ -98,6 +107,8 @@ source "drivers/usb/core/Kconfig"
 
 source "drivers/usb/mon/Kconfig"
 
+source "drivers/usb/wusbcore/Kconfig"
+
 source "drivers/usb/host/Kconfig"
 
 source "drivers/usb/musb/Kconfig"
@@ -148,4 +159,6 @@ source "drivers/usb/atm/Kconfig"
 
 source "drivers/usb/gadget/Kconfig"
 
+source "drivers/usb/otg/Kconfig"
+
 endif # USB_SUPPORT