1 files changed, 22 insertions, 21 deletions

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 75823a1abeb6..e4405e088589 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -10,27 +10,6 @@ menuconfig USB_SUPPORT
           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
@@ -76,6 +55,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 +63,27 @@ config USB_ARCH_HAS_XHCI
         boolean
         default PCI
 
+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"