tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

David Daney and committed by
Greg Kroah-Hartman 53c6bc24 8d069842

+21 -21
+21 -21
drivers/usb/Kconfig
··· 10 10 This option adds core support for Universal Serial Bus (USB). 11 11 You will also need drivers from the following menu to make use of it. 12 12 13 - if USB_SUPPORT 14 - 15 - config USB_COMMON 16 - tristate 17 - default y 18 - depends on USB || USB_GADGET 19 - 20 - # Host-side USB depends on having a host controller 21 - # NOTE: dummy_hcd is always an option, but it's ignored here ... 22 - # NOTE: SL-811 option should be board-specific ... 23 - config USB_ARCH_HAS_HCD 24 - boolean 25 - default y if USB_ARCH_HAS_OHCI 26 - default y if USB_ARCH_HAS_EHCI 27 - default y if USB_ARCH_HAS_XHCI 28 - default y if PCMCIA && !M32R # sl811_cs 29 - default y if ARM # SL-811 30 - default y if BLACKFIN # SL-811 31 - default y if SUPERH # r8a66597-hcd 32 - default PCI 33 - 34 13 # many non-PCI SOC chips embed OHCI 35 14 config USB_ARCH_HAS_OHCI 36 15 boolean ··· 61 82 # some non-PCI HCDs implement xHCI 62 83 config USB_ARCH_HAS_XHCI 63 84 boolean 85 + default PCI 86 + 87 + if USB_SUPPORT 88 + 89 + config USB_COMMON 90 + tristate 91 + default y 92 + depends on USB || USB_GADGET 93 + 94 + # Host-side USB depends on having a host controller 95 + # NOTE: dummy_hcd is always an option, but it's ignored here ... 96 + # NOTE: SL-811 option should be board-specific ... 97 + config USB_ARCH_HAS_HCD 98 + boolean 99 + default y if USB_ARCH_HAS_OHCI 100 + default y if USB_ARCH_HAS_EHCI 101 + default y if USB_ARCH_HAS_XHCI 102 + default y if PCMCIA && !M32R # sl811_cs 103 + default y if ARM # SL-811 104 + default y if BLACKFIN # SL-811 105 + default y if SUPERH # r8a66597-hcd 64 106 default PCI 65 107 66 108 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.