diff options
| author | David Daney <[email protected]> | 2012-03-22 14:01:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2012-04-06 13:37:21 -0700 |
| commit | a8edc42a11e1d7b7e158d4026670fd83854dfcc2 (patch) | |
| tree | 937569113ed041efd6d4247b83baad513d1a0f45 | |
| parent | dd775ae2549217d3ae09363e3edb305d0fa19928 (diff) | |
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 <[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]>
| -rw-r--r-- | drivers/usb/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index cbd8f5f80596..76316a33061b 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 |