diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 10:13:01 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 10:13:01 +0200 |
commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
tree | 972993c6568085b8d407fc7e13de10f4b93c651d /drivers/usb/host/Makefile | |
parent | Input: synaptics - fix regression with "image sensor" trackpads (diff) | |
parent | Input: matrix-keymap - fix building keymaps (diff) | |
download | linux-e644dae645e167d154c0526358940986682a72b0.tar.xz linux-e644dae645e167d154c0526358940986682a72b0.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/usb/host/Makefile')
-rw-r--r-- | drivers/usb/host/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 7ca290fcb070..0982bcc140bd 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -15,6 +15,10 @@ 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 +ifneq ($(CONFIG_USB_XHCI_PLATFORM), ) + xhci-hcd-y += xhci-plat.o +endif + obj-$(CONFIG_USB_WHCI_HCD) += whci/ obj-$(CONFIG_PCI) += pci-quirks.o |