diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 04:51:07 -0500 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /drivers/usb/host/Makefile | |
| parent | 3d95fd6ad8d3cf582a70ed65660017114b6e4065 (diff) | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'drivers/usb/host/Makefile')
| -rw-r--r-- | drivers/usb/host/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 624a362f2fee..7ca290fcb070 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 | |||
| 11 | 11 | ||
| 12 | fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o | 12 | fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o |
| 13 | 13 | ||
| 14 | xhci-hcd-y := xhci.o xhci-mem.o xhci-pci.o | 14 | xhci-hcd-y := xhci.o xhci-mem.o |
| 15 | xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o | 15 | xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o |
| 16 | xhci-hcd-$(CONFIG_PCI) += xhci-pci.o | ||
| 16 | 17 | ||
| 17 | obj-$(CONFIG_USB_WHCI_HCD) += whci/ | 18 | obj-$(CONFIG_USB_WHCI_HCD) += whci/ |
| 18 | 19 | ||
| @@ -35,3 +36,4 @@ obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o | |||
| 35 | obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o | 36 | obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o |
| 36 | obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o | 37 | obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o |
| 37 | obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o | 38 | obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o |
| 39 | obj-$(CONFIG_MIPS_ALCHEMY) += alchemy-common.o | ||