diff --git a/[refs] b/[refs]
index 113272fa08d8..cabd2b5ba62e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fa7aa0d13a2921c1defc53f82f09bffaef17b4c
+refs/heads/master: 11143102f433b99c3af447edb2da080607c2b8ab
diff --git a/trunk/drivers/staging/dream/camera/Makefile b/trunk/drivers/staging/dream/camera/Makefile
index db228d7d1136..03711dc6f482 100644
--- a/trunk/drivers/staging/dream/camera/Makefile
+++ b/trunk/drivers/staging/dream/camera/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS=-Idrivers/staging/dream/include
+ccflags-y:=-Idrivers/staging/dream/include
 obj-$(CONFIG_MT9T013) += mt9t013.o mt9t013_reg.o
 obj-$(CONFIG_MT9D112) += mt9d112.o mt9d112_reg.o
 obj-$(CONFIG_MT9P012) += mt9p012_fox.o mt9p012_reg.o