Auto merge with /home/aegl/GIT/ia64-test

[linux-2.6] / drivers / usb / Makefile

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index a708a1dbb530fd3b4b68992a460a9e69e45e69b1..d79cd218a55145768682d3b8e750f373a7f897ee 100644 (file)
--- 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/