Commit a8edc42a authored by David Daney's avatar David Daney Committed by Greg Kroah-Hartman

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: default avatarJulian Wollrath <jwollrath@web.de>
Reported-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Reported-by: default avatarRupesh Gujare <rgujare@ozmodevices.com>
Reported-by: default avatarFeng King <ronyjin@tencent.com>
Reported-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Tested-by: default avatarPeter Chen <peter.chen@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd775ae2
...@@ -2,14 +2,6 @@ ...@@ -2,14 +2,6 @@
# USB device configuration # 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 # many non-PCI SOC chips embed OHCI
config USB_ARCH_HAS_OHCI config USB_ARCH_HAS_OHCI
boolean boolean
...@@ -63,6 +55,14 @@ config USB_ARCH_HAS_XHCI ...@@ -63,6 +55,14 @@ config USB_ARCH_HAS_XHCI
boolean boolean
default PCI 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 if USB_SUPPORT
config USB_COMMON config USB_COMMON
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment