Merge branch 'l2x0-pull-rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4...

[~andy/linux] / drivers / usb / wusbcore / Makefile

diff --git a/drivers/usb/wusbcore/Makefile b/drivers/usb/wusbcore/Makefile
index 75f1ade66258bf3a355b7391d8855d16c57d9e8b..b3bd313032b10dcb2c8619b94286ad9fb2ee633b 100644 (file)
--- a/drivers/usb/wusbcore/Makefile
+++ b/drivers/usb/wusbcore/Makefile
@@ -1,9 +1,11 @@
+ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG
+
 obj-$(CONFIG_USB_WUSB)         += wusbcore.o
 obj-$(CONFIG_USB_HWA_HCD)      += wusb-wa.o
 obj-$(CONFIG_USB_WUSB_CBAF)    += wusb-cbaf.o
 
 
-wusbcore-objs :=       \
+wusbcore-y :=          \
        crypto.o        \
        devconnect.o    \
        dev-sysfs.o     \
@@ -14,13 +16,10 @@ wusbcore-objs :=    \
        security.o      \
        wusbhc.o
 
-wusb-cbaf-objs := cbaf.o
-
-wusb-wa-objs :=        wa-hc.o         \
-               wa-nep.o        \
-               wa-rpipe.o      \
-               wa-xfer.o
+wusb-cbaf-y := cbaf.o
 
-ifeq ($(CONFIG_USB_WUSB_CBAF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+wusb-wa-y :=           \
+       wa-hc.o         \
+       wa-nep.o        \
+       wa-rpipe.o      \
+       wa-xfer.o