diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-22 14:12:32 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-22 14:12:32 -0500 |
| commit | dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch) | |
| tree | 1c63e7c2f879cd322ca785671b74b4ff796dd24c /drivers/usb/host/Makefile | |
| parent | a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/usb/host/Makefile')
| -rw-r--r-- | drivers/usb/host/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 23be22224044..e5f3f20787e4 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile | |||
| @@ -13,6 +13,7 @@ obj-$(CONFIG_USB_WHCI_HCD) += whci/ | |||
| 13 | obj-$(CONFIG_PCI) += pci-quirks.o | 13 | obj-$(CONFIG_PCI) += pci-quirks.o |
| 14 | 14 | ||
| 15 | obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o | 15 | obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o |
| 16 | obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o | ||
| 16 | obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o | 17 | obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o |
| 17 | obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o | 18 | obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o |
| 18 | obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o | 19 | obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o |