diff --git a/[refs] b/[refs]
index fcfb6c417c54..38ad4878bc23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68071add91b22fa361b65765e80107c44927b5fb
+refs/heads/master: dd694441e31ebdabc439874c7eca4af0fa8ab338
diff --git a/trunk/drivers/staging/cx25821/Makefile b/trunk/drivers/staging/cx25821/Makefile
index 14b3af1e71ed..10f87f05d8e8 100644
--- a/trunk/drivers/staging/cx25821/Makefile
+++ b/trunk/drivers/staging/cx25821/Makefile
@@ -12,5 +12,3 @@ EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
-
-EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)