diff --git a/[refs] b/[refs]
index 605b7f944005..8bc4b9053d7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8138d41632a551a65fd02f9c883e4e37f63d596f
+refs/heads/master: edffd7d91dc8003fb744ef6fce0271cb9265202b
diff --git a/trunk/drivers/staging/rtl8192e/Makefile b/trunk/drivers/staging/rtl8192e/Makefile
index 41cb4d3d6262..6e410674359c 100644
--- a/trunk/drivers/staging/rtl8192e/Makefile
+++ b/trunk/drivers/staging/rtl8192e/Makefile
@@ -1,13 +1,13 @@
 NIC_SELECT = RTL8192E
 
-EXTRA_CFLAGS += -DRTL8192E
-EXTRA_CFLAGS += -std=gnu89
-EXTRA_CFLAGS += -O2
-EXTRA_CFLAGS += -DTHOMAS_TURBO
-EXTRA_CFLAGS += -DENABLE_DOT11D
+ccflags-y := -DRTL8192E
+ccflags-y += -std=gnu89
+ccflags-y += -O2
+ccflags-y += -DTHOMAS_TURBO
+ccflags-y += -DENABLE_DOT11D
 
-EXTRA_CFLAGS += -DENABLE_IPS
-EXTRA_CFLAGS += -DENABLE_LPS
+ccflags-y += -DENABLE_IPS
+ccflags-y += -DENABLE_LPS
 
 r8192e_pci-objs :=		\
 	r8192E_core.o		\