Commit a8edc42a authored Mar 22, 2012 by David Daney Committed by Greg Kroah-Hartman Apr 06, 2012

usb: Put USB Kconfig items back under USB.



commit 53c6bc24 (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>
Reported-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Reported-by: Borislav Petkov <bp@alien8.de>
Reported-by: Rupesh Gujare <rgujare@ozmodevices.com>
Reported-by: Feng King <ronyjin@tencent.com>
Reported-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Tested-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent dd775ae2

drivers/usb/Kconfig

+8 −8

Original line number	Diff line number	Diff line
		@@ -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

Admin message