Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / staging / usbip / Makefile

diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile
index 6f2916b1807a6e538f8b0275251de0bb1afc05ab..279f3cc3eea80daa19bf2d6fe447efe4b3145d6a 100644 (file)
--- a/drivers/staging/usbip/Makefile
+++ b/drivers/staging/usbip/Makefile
@@ -1,12 +1,11 @@
 obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o
-usbip_common_mod-objs := usbip_common.o usbip_event.o
+usbip_common_mod-y := 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
+vhci-hcd-y := 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
+usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o
+
+ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG
 
-ifeq ($(CONFIG_USB_IP_DEBUG_ENABLE),y)
-       EXTRA_CFLAGS += -DDEBUG
-endif