summaryrefslogtreecommitdiffstats
path: root/drivers/usb/Kconfig
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2012-03-22 14:01:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-06 13:37:21 -0700
commita8edc42a11e1d7b7e158d4026670fd83854dfcc2 (patch)
tree937569113ed041efd6d4247b83baad513d1a0f45 /drivers/usb/Kconfig
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
downloadop-kernel-dev-a8edc42a11e1d7b7e158d4026670fd83854dfcc2.zip
op-kernel-dev-a8edc42a11e1d7b7e158d4026670fd83854dfcc2.tar.gz
usb: Put USB Kconfig items back under USB.
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> 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>
Diffstat (limited to 'drivers/usb/Kconfig')
-rw-r--r--drivers/usb/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index cbd8f5f..76316a3 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
OpenPOWER on IntegriCloud