From 8082b3b8c4c4f55fd128900d873a5a673f9a6489 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 23 Sep 2011 14:19:56 -0700
Subject: [PATCH] --- yaml --- r: 265029 b: refs/heads/master c:
 7b7200098011a3f2b66f702b6fe47122cba585a3 h: refs/heads/master i:   265027:
 b653f191f9ef4b24a6f9a7dbe46cab338040a0bb v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/usb/Kconfig      | 6 ++++++
 trunk/drivers/usb/host/Kconfig | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8013a02e23c7..0df8e94acdb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd68176abf1098af83c968da274fe908eb7a8a72
+refs/heads/master: 7b7200098011a3f2b66f702b6fe47122cba585a3
diff --git a/trunk/drivers/usb/Kconfig b/trunk/drivers/usb/Kconfig
index 97c4cc724189..251279e756fa 100644
--- a/trunk/drivers/usb/Kconfig
+++ b/trunk/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/trunk/drivers/usb/host/Kconfig b/trunk/drivers/usb/host/Kconfig
index 13e1f672926d..3e5b23525d00 100644
--- a/trunk/drivers/usb/host/Kconfig
+++ b/trunk/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.