summaryrefslogtreecommitdiffstats
path: root/drivers/usb/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 00:13:26 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-28 00:13:26 +0200
commitd3b8a1a8496c83bc4a3cc76505c29255af15572c (patch)
treeb56eb3ef27117bad5c516d6b647bdcd465d7659a /drivers/usb/Makefile
parent[PATCH] cciss: remove partition info from CCISS_GETLUNINFO (diff)
parent[PATCH] USB: usbcore: inverted test for resuming interfaces (diff)
downloadlinux-d3b8a1a8496c83bc4a3cc76505c29255af15572c.tar.xz
linux-d3b8a1a8496c83bc4a3cc76505c29255af15572c.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/Makefile')
-rw-r--r--drivers/usb/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index a708a1dbb530..d79cd218a551 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_USB) += core/
obj-$(CONFIG_USB_MON) += mon/
obj-$(CONFIG_USB_EHCI_HCD) += host/
+obj-$(CONFIG_USB_ISP116X_HCD) += host/
obj-$(CONFIG_USB_OHCI_HCD) += host/
obj-$(CONFIG_USB_UHCI_HCD) += host/
obj-$(CONFIG_USB_SL811_HCD) += host/