usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.
The fact that an architecture/board has XHCI, OHCI or EHCI does not depend on the fact that the kernel is configured with USB_SUPPORT. Make the Kconfig reflect this fact thus avoiding ugly messages like: warning: (MIPS_ALCHEMY && CAVIUM_OCTEON_REFERENCE_BOARD && SOC_AR71XX && SOC_AR724X && SOC_AR913X && SOC_AR933X) selects USB_ARCH_HAS_EHCI which has unmet direct dependencies (USB_SUPPORT) Signed-off-by: David Daney <david.daney@cavium.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
8d06984288
commit
53c6bc24fd
|
@ -10,27 +10,6 @@ menuconfig USB_SUPPORT
|
|||
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
|
||||
tristate
|
||||
default y
|
||||
depends on USB || USB_GADGET
|
||||
|
||||
# Host-side USB depends on having a host controller
|
||||
# NOTE: dummy_hcd is always an option, but it's ignored here ...
|
||||
# NOTE: SL-811 option should be board-specific ...
|
||||
config USB_ARCH_HAS_HCD
|
||||
boolean
|
||||
default y if USB_ARCH_HAS_OHCI
|
||||
default y if USB_ARCH_HAS_EHCI
|
||||
default y if USB_ARCH_HAS_XHCI
|
||||
default y if PCMCIA && !M32R # sl811_cs
|
||||
default y if ARM # SL-811
|
||||
default y if BLACKFIN # SL-811
|
||||
default y if SUPERH # r8a66597-hcd
|
||||
default PCI
|
||||
|
||||
# many non-PCI SOC chips embed OHCI
|
||||
config USB_ARCH_HAS_OHCI
|
||||
boolean
|
||||
|
@ -84,6 +63,27 @@ config USB_ARCH_HAS_XHCI
|
|||
boolean
|
||||
default PCI
|
||||
|
||||
if USB_SUPPORT
|
||||
|
||||
config USB_COMMON
|
||||
tristate
|
||||
default y
|
||||
depends on USB || USB_GADGET
|
||||
|
||||
# Host-side USB depends on having a host controller
|
||||
# NOTE: dummy_hcd is always an option, but it's ignored here ...
|
||||
# NOTE: SL-811 option should be board-specific ...
|
||||
config USB_ARCH_HAS_HCD
|
||||
boolean
|
||||
default y if USB_ARCH_HAS_OHCI
|
||||
default y if USB_ARCH_HAS_EHCI
|
||||
default y if USB_ARCH_HAS_XHCI
|
||||
default y if PCMCIA && !M32R # sl811_cs
|
||||
default y if ARM # SL-811
|
||||
default y if BLACKFIN # SL-811
|
||||
default y if SUPERH # r8a66597-hcd
|
||||
default PCI
|
||||
|
||||
# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
|
||||
config USB
|
||||
tristate "Support for Host-side USB"
|
||||
|
|
Loading…
Reference in a new issue