Merge tag 'for-torvalds-20120418' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 75823a1abeb66bebdf58f41de4cecbc7048ce0be..76316a33061b91b48a62a60f6be1b921227c6ed8 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -2,42 +2,13 @@
 # USB device configuration
 #
 
-menuconfig USB_SUPPORT
-       bool "USB support"
-       depends on HAS_IOMEM
-       default y
-       ---help---
-         This option adds core support for Universal Serial Bus (USB).
-         You will also need drivers from the following menu to make use of it.
-
-if USB_SUPPORT
-
-config USB_COMMON
-       tristate
-       default y
-       depends on USB || USB_GADGET
-
-# Host-side USB depends on having a host controller
-# NOTE:  dummy_hcd is always an option, but it's ignored here ...
-# NOTE:  SL-811 option should be board-specific ...
-config USB_ARCH_HAS_HCD
-       boolean
-       default y if USB_ARCH_HAS_OHCI
-       default y if USB_ARCH_HAS_EHCI
-       default y if USB_ARCH_HAS_XHCI
-       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
-
 # many non-PCI SOC chips embed OHCI
 config USB_ARCH_HAS_OHCI
        boolean
        # ARM:
        default y if SA1111
        default y if ARCH_OMAP
-       default y if ARCH_S3C2410
+       default y if ARCH_S3C24XX
        default y if PXA27x
        default y if PXA3xx
        default y if ARCH_EP93XX
@@ -65,7 +36,7 @@ config USB_ARCH_HAS_EHCI
        default y if PPC_MPC512x
        default y if ARCH_IXP4XX
        default y if ARCH_W90X900
-       default y if ARCH_AT91SAM9G45
+       default y if ARCH_AT91
        default y if ARCH_MXC
        default y if ARCH_OMAP3
        default y if ARCH_CNS3XXX
@@ -76,6 +47,7 @@ config USB_ARCH_HAS_EHCI
        default y if MICROBLAZE
        default y if SPARC_LEON
        default y if ARCH_MMP
+       default y if MACH_LOONGSON1
        default PCI
 
 # some non-PCI HCDs implement xHCI
@@ -83,6 +55,35 @@ config USB_ARCH_HAS_XHCI
        boolean
        default PCI
 
+menuconfig USB_SUPPORT
+       bool "USB support"
+       depends on HAS_IOMEM
+       default y
+       ---help---
+         This option adds core support for Universal Serial Bus (USB).
+         You will also need drivers from the following menu to make use of it.
+
+if USB_SUPPORT
+
+config USB_COMMON
+       tristate
+       default y
+       depends on USB || USB_GADGET
+
+# Host-side USB depends on having a host controller
+# NOTE:  dummy_hcd is always an option, but it's ignored here ...
+# NOTE:  SL-811 option should be board-specific ...
+config USB_ARCH_HAS_HCD
+       boolean
+       default y if USB_ARCH_HAS_OHCI
+       default y if USB_ARCH_HAS_EHCI
+       default y if USB_ARCH_HAS_XHCI
+       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
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
        tristate "Support for Host-side USB"