summaryrefslogtreecommitdiff
path: root/drivers/usb/host/Makefile
diff options
context:
space:
mode:
authorAndrew Bresticker <abrestic@chromium.org>2014-10-03 12:35:29 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-04 01:44:45 +0400
commit29e409f0f7613f9fd2235e41f0fa33e48e94544e (patch)
tree3cbc0c17d8e7bfb2c86466b4cdfaac75c4abd423 /drivers/usb/host/Makefile
parent436e8c7d457ff4ca89beca20cf54f5884de6af61 (diff)
downloadlinux-29e409f0f7613f9fd2235e41f0fa33e48e94544e.tar.xz
xhci: Allow xHCI drivers to be built as separate modules
Instead of building all of the xHCI code into a single module, separate it out into the core (xhci-hcd), PCI (xhci-pci, now selected by the new config option CONFIG_USB_XHCI_PCI), and platform (xhci-plat) drivers. Also update the PCI/platform drivers with module descriptions/licenses and have them register their respective drivers in their initcalls. Signed-off-by: Andrew Bresticker <abrestic@chromium.org> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/Makefile')
-rw-r--r--drivers/usb/host/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 0336bb2c0e6f..8c6918907b15 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -15,22 +15,22 @@ fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o
xhci-hcd-y := xhci.o xhci-mem.o
xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o
xhci-hcd-y += xhci-trace.o
-xhci-hcd-$(CONFIG_PCI) += xhci-pci.o
-ifneq ($(CONFIG_USB_XHCI_PLATFORM), )
- xhci-hcd-y += xhci-plat.o
+xhci-plat-hcd-y := xhci-plat.o
ifneq ($(CONFIG_USB_XHCI_MVEBU), )
- xhci-hcd-y += xhci-mvebu.o
+ xhci-plat-hcd-y += xhci-mvebu.o
endif
ifneq ($(CONFIG_USB_XHCI_RCAR), )
- xhci-hcd-y += xhci-rcar.o
-endif
+ xhci-plat-hcd-y += xhci-rcar.o
endif
obj-$(CONFIG_USB_WHCI_HCD) += whci/
obj-$(CONFIG_PCI) += pci-quirks.o
+obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
+obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o
+
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o