summaryrefslogtreecommitdiff
path: root/drivers/usb/host/Makefile
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2011-09-23 14:20:02 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-26 15:51:14 -0700
commit0cc47d547d7a482434926331265b3713381b1e60 (patch)
tree77530e02def9808bf064bdbe48e9fc339f4b832e /drivers/usb/host/Makefile
parent552e0c4f12fef0ad1caf21d2b57ac3a2735edef3 (diff)
downloadlinux-3.10-0cc47d547d7a482434926331265b3713381b1e60.tar.gz
linux-3.10-0cc47d547d7a482434926331265b3713381b1e60.tar.bz2
linux-3.10-0cc47d547d7a482434926331265b3713381b1e60.zip
usb/xhci: remove CONFIG_PCI in xhci.c's probe function
This removes the need of ifdefs within the init function and with it the headache about the correct clean without bus X but with bus/platform Y & Z. xhci-pci is only compiled if CONFIG_PCI is selected which can be de-selected now without trouble. For now the result is kinda useless because we have no other glue code. However, since nobody is using USB_ARCH_HAS_XHCI then it should not be an issue :) Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/Makefile')
-rw-r--r--drivers/usb/host/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 624a362f2fe..ed48a5d79e1 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -11,8 +11,9 @@ fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o
fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o
-xhci-hcd-y := xhci.o xhci-mem.o xhci-pci.o
+xhci-hcd-y := xhci.o xhci-mem.o
xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o
+xhci-hcd-$(CONFIG_PCI) += xhci-pci.o
obj-$(CONFIG_USB_WHCI_HCD) += whci/