diff --git a/[refs] b/[refs]
index 94cb15e4621d..46915c0ec9d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fff598fc700a9f2089a3351a54e049d79faa631
+refs/heads/master: b37492be25be5ff0551bff8b479e783498ebe838
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index 18b844219c1f..9debef9be8c8 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -88,3 +88,5 @@ obj-$(CONFIG_USB_VICAM)         += usbvideo/
 obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT
+