Merge branch 'bugzilla-11715' into test

[linux-2.6-omap-h63xx.git] / drivers / staging / usbip / Makefile

diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile
index 6ef4c3913f4589a2c4475007d7eb93f212efd9db..179f4211f96b04ab73eaf44bd0fd36d5afd832d7 100644 (file)
--- a/drivers/staging/usbip/Makefile
+++ b/drivers/staging/usbip/Makefile
@@ -4,6 +4,9 @@ usbip_common_mod-objs := usbip_common.o usbip_event.o
 obj-$(CONFIG_USB_IP_VHCI_HCD) += vhci-hcd.o
 vhci-hcd-objs := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o
 
+obj-$(CONFIG_USB_IP_HOST) += usbip.o
+usbip-objs := stub_dev.o stub_main.o stub_rx.o stub_tx.o
+
 ifeq ($(CONFIG_USB_DEBUG),y)
        EXTRA_CFLAGS += -DDEBUG
 endif