From 7b7200098011a3f2b66f702b6fe47122cba585a3 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 23 Sep 2011 14:19:56 -0700 Subject: [PATCH] usb/host: introduce USB_ARCH_HAS_XHCI to make it look like OHCI and EHCI, we introduce that symbol and USB_XHCI_HCD depend on that instead of PCI. [bigeasy@linutronix.de: wire up USB_ARCH_HAS_HCD] Signed-off-by: Felipe Balbi Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman --- drivers/usb/Kconfig | 6 ++++++ drivers/usb/host/Kconfig | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 97c4cc724189..251279e756fa 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -24,6 +24,7 @@ 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 @@ -77,6 +78,11 @@ config USB_ARCH_HAS_EHCI default y if ARCH_MMP default PCI +# some non-PCI HCDs implement xHCI +config USB_ARCH_HAS_XHCI + boolean + default PCI + # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. config USB tristate "Support for Host-side USB" diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 13e1f672926d..3e5b23525d00 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -19,7 +19,7 @@ config USB_C67X00_HCD config USB_XHCI_HCD tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)" - depends on USB && PCI && EXPERIMENTAL + depends on USB && USB_ARCH_HAS_XHCI && EXPERIMENTAL ---help--- The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 "SuperSpeed" host controller hardware. -- 2.20.1