diff --git a/[refs] b/[refs]
index 640ff833465b..3cd4cf1b9508 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c937ca034a033a228e9f66bfda02d5037b08180e
+refs/heads/master: a2262508cba04587dbb0793ddf23be57f86dc583
diff --git a/trunk/drivers/staging/media/as102/Makefile b/trunk/drivers/staging/media/as102/Makefile
index d8dfb757f1e2..8916d8a909bc 100644
--- a/trunk/drivers/staging/media/as102/Makefile
+++ b/trunk/drivers/staging/media/as102/Makefile
@@ -3,4 +3,4 @@ dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
 
 obj-$(CONFIG_DVB_AS102) += dvb-as102.o
 
-EXTRA_CFLAGS += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/dvb-core