diff --git a/[refs] b/[refs]
index 93f34ee8a0b7..026dba9d6aab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ad10e552e36d0c082eb5528dea2315f8ae73a4f
+refs/heads/master: 23e59c47b51103a90f582603209380dbf3271751
diff --git a/trunk/drivers/staging/rt2870/Makefile b/trunk/drivers/staging/rt2870/Makefile
index 523e7e738d00..7b29493eb40e 100644
--- a/trunk/drivers/staging/rt2870/Makefile
+++ b/trunk/drivers/staging/rt2870/Makefile
@@ -2,10 +2,10 @@
 obj-$(CONFIG_RT2870)	+= rt2870sta.o
 
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
-EXTRA_CFLAGS += -DRTMP_MAC_USB -DRTMP_USB_SUPPORT -DRT2870 -DRTMP_TIMER_TASK_SUPPORT
-EXTRA_CFLAGS += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3070
-EXTRA_CFLAGS += -DDBG
+ccflags-y := -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
+ccflags-y += -DRTMP_MAC_USB -DRTMP_USB_SUPPORT -DRT2870 -DRTMP_TIMER_TASK_SUPPORT
+ccflags-y += -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DRT30xx -DRT3070
+ccflags-y += -DDBG
 
 rt2870sta-objs :=		\
 	common/crypt_md5.o	\