projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
usb
/
host
/
Makefile
diff --git
a/drivers/usb/host/Makefile
b/drivers/usb/host/Makefile
index
436cd71
..
7ca290f
100644
(file)
--- 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/