usb: Put USB Kconfig items back under USB.

commit 53c6bc24fd (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]>
Reported-by: Nobuhiro Iwamatsu <[email protected]>
Reported-by: Borislav Petkov <[email protected]>
Reported-by: Rupesh Gujare <[email protected]>
Reported-by: Feng King <[email protected]>
Reported-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by: David Daney <[email protected]>
Tested-by: Peter Chen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
David Daney 2012-03-22 14:01:07 -07:00 • committed by Greg Kroah-Hartman
commit a8edc42a11

View file

@ -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