diff --git a/[refs] b/[refs]
index 8bc4b9053d7b..e403b7bc189e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edffd7d91dc8003fb744ef6fce0271cb9265202b
+refs/heads/master: bee9f581f09d12e5c4fb5182a66538605c1ad719
diff --git a/trunk/drivers/staging/tm6000/Makefile b/trunk/drivers/staging/tm6000/Makefile
index 77e06bfd2c46..d8ccdaa8c650 100644
--- a/trunk/drivers/staging/tm6000/Makefile
+++ b/trunk/drivers/staging/tm6000/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
 obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
 obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
 
-EXTRA_CFLAGS = -Idrivers/media/video
-EXTRA_CFLAGS += -Idrivers/media/common/tuners
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
+ccflags-y := -Idrivers/media/video
+ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb/frontends