diff --git a/[refs] b/[refs]
index 663709489804..113272fa08d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1746fecdee03279a47ad75e689b6fefe368e67
+refs/heads/master: 6fa7aa0d13a2921c1defc53f82f09bffaef17b4c
diff --git a/trunk/drivers/staging/cxt1e1/Makefile b/trunk/drivers/staging/cxt1e1/Makefile
index 10020d7b79a8..a524a62476d9 100644
--- a/trunk/drivers/staging/cxt1e1/Makefile
+++ b/trunk/drivers/staging/cxt1e1/Makefile
@@ -1,8 +1,8 @@
 obj-$(CONFIG_CXT1E1)	+= cxt1e1.o
 
-EXTRA_CFLAGS += -DSBE_PMCC4_ENABLE
-EXTRA_CFLAGS += -DSBE_ISR_TASKLET
-EXTRA_CFLAGS += -DSBE_INCLUDE_SYMBOLS
+ccflags-y := -DSBE_PMCC4_ENABLE
+ccflags-y += -DSBE_ISR_TASKLET
+ccflags-y += -DSBE_INCLUDE_SYMBOLS
 
 cxt1e1-objs += 	\
   ossiRelease.o 	\