diff --git a/[refs] b/[refs]
index cabd2b5ba62e..93f34ee8a0b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11143102f433b99c3af447edb2da080607c2b8ab
+refs/heads/master: 4ad10e552e36d0c082eb5528dea2315f8ae73a4f
diff --git a/trunk/drivers/staging/dream/Makefile b/trunk/drivers/staging/dream/Makefile
index fbea0abcc864..87de1a57f237 100644
--- a/trunk/drivers/staging/dream/Makefile
+++ b/trunk/drivers/staging/dream/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS=-Idrivers/staging/dream/include
+ccflags-y:=-Idrivers/staging/dream/include
 obj-$(CONFIG_MSM_ADSP)		+= qdsp5/
 obj-$(CONFIG_MSM_CAMERA)	+= camera/
 obj-$(CONFIG_INPUT_GPIO)	+= gpio_axis.o gpio_event.o gpio_input.o gpio_matrix.o gpio_output.o