diff --git a/[refs] b/[refs]
index bc406e86404a..e4c74bc8163d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fa51743dcf176bcdca43603b4257748a222fe9b
+refs/heads/master: cb299ba8b5ef2239429484072fea394cd7581bd7
diff --git a/trunk/drivers/char/mwave/Makefile b/trunk/drivers/char/mwave/Makefile
index 754c9e2058ed..26b4fce217b6 100644
--- a/trunk/drivers/char/mwave/Makefile
+++ b/trunk/drivers/char/mwave/Makefile
@@ -6,10 +6,10 @@
 
 obj-$(CONFIG_MWAVE) += mwave.o
 
-mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o
+mwave-y := mwavedd.o smapi.o tp3780i.o 3780i.o
 
 # To have the mwave driver disable other uarts if necessary
 # EXTRA_CFLAGS += -DMWAVE_FUTZ_WITH_OTHER_DEVICES
 
 # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging:
-EXTRA_CFLAGS += -DMW_TRACE
+ccflags-y := -DMW_TRACE