Skip to contentSkip to conversation

usb: Put USB Kconfig items back under USB.

PATCH In review David Daney 2 participants 2 messages Mar 22, 2012 – Mar 27, 2012 USB

lore
Share & tools
lore

David Daney

author
#0 lore raw

PATCH 1/1 usb: Put USB Kconfig items back under USB.

From: David Daney <[email protected]>

commit 53c6bc24fdc8db87109a5760579cbb060fa644cf (usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.) Removed the dependency of the USB_ARCH_HAS_* symbols on USB_SUPPORT. However the resulting Kconfig somehow caused many of the USB configuration items to appear under the top level devices menu.

To fix this we reunite the 'menuconfig USB_SUPPORT' with the 'if USB_SUPPORT', and the config items magically go back to their desired location.

Reported-by Julian Wollrath <[email protected]>
Signed-off-by David Daney <[email protected]>
---
 drivers/usb/Kconfig |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/Kconfig +8 -8
index e4405e0..437a77e 100644
@@ -2,14 +2,6 @@
 # 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.
-
 # many non-PCI SOC chips embed OHCI
 config USB_ARCH_HAS_OHCI
 	boolean

@@ -63,6 +55,14 @@ 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
Signature · 1 line
1.7.2.3
Tested-by on v1 1/1
#1 lore raw
Quoted 40 lines
Reported-by Julian Wollrath <[email protected]>
Signed-off-by David Daney <[email protected]>

---
 drivers/usb/Kconfig |   16 ++++++++--------

 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/Kconfig +0 -8
index e4405e0..437a77e 100644
@@ -2,14 +2,6 @@
  # 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.
-
  # many non-PCI SOC chips embed OHCI

 config USB_ARCH_HAS_OHCI
       boolean

drivers/usb/Kconfig +0 -0
@@ -63,6 +55,14 @@ config USB_ARCH_HAS_XHCI

       boolean
       default PCI

drivers/usb/Kconfig +8 -0
+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

Quoted 1 line

 config USB_COMMON

Yes, it works.

Tested-by Peter Chen <[email protected]>
Quoted 7 lines

--
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
BR,
Peter Chen