[PATCH] usb: Put USB Kconfig items back under USB.

[PATCH] usb: Put USB Kconfig items back under USB.

[David Daney]

From: David Daney <david.daney@cavium.com>

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 <jwollrath@web.de>
Signed-off-by: David Daney <david.daney@cavium.com>
---
 drivers/usb/Kconfig |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index e4405e0..437a77e 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -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
-- 
1.7.2.3

Re: [PATCH] usb: Put USB Kconfig items back under USB.

[Peter Chen]

>
> Reported-by: Julian Wollrath <jwollrath@web.de>
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---
>  drivers/usb/Kconfig |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
> index e4405e0..437a77e 100644
> --- a/drivers/usb/Kconfig
> +++ b/drivers/usb/Kconfig
> @@ -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
Yes, it works.

Tested-by: Peter Chen <peter.chen@freescale.com>

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



-- 
BR,
Peter Chen