diff --git a/[refs] b/[refs]
index 026dba9d6aab..5485670ae360 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23e59c47b51103a90f582603209380dbf3271751
+refs/heads/master: 958f2f42e2328c5fda24e25c1d1cdbddaf438325
diff --git a/trunk/drivers/staging/easycap/Makefile b/trunk/drivers/staging/easycap/Makefile
index d93bd6b70a4b..680f370f33d1 100644
--- a/trunk/drivers/staging/easycap/Makefile
+++ b/trunk/drivers/staging/easycap/Makefile
@@ -5,9 +5,9 @@ easycap-objs	:= easycap_main.o easycap_low.o easycap_sound.o
 easycap-objs	+= easycap_ioctl.o easycap_settings.o
 easycap-objs	+= easycap_testcard.o
 
-EXTRA_CFLAGS += -Wall
+ccflags-y := -Wall
 # Impose all or none of the following:
-EXTRA_CFLAGS += -DEASYCAP_IS_VIDEODEV_CLIENT
-EXTRA_CFLAGS += -DEASYCAP_NEEDS_V4L2_DEVICE_H
-EXTRA_CFLAGS += -DEASYCAP_NEEDS_V4L2_FOPS
+ccflags-y += -DEASYCAP_IS_VIDEODEV_CLIENT
+ccflags-y += -DEASYCAP_NEEDS_V4L2_DEVICE_H
+ccflags-y += -DEASYCAP_NEEDS_V4L2_FOPS