diff --git a/[refs] b/[refs]
index d652104872f5..2d760dce8ff6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79618cf41337ccedb9abeee059ce76aac7962739
+refs/heads/master: ba366a23b68029fc8560acf1ad8735eed910f962
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index c8140aec1a16..b5a064163e03 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -90,7 +90,7 @@ obj-$(CONFIG_TUNER_TEA5761) += tea5761.o
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
 obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
-obj-$(CONFIG_VIDEO_BUF_DVB) += video-buf-dvb.o
+obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
 obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
 
diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
index 875a9abab2a2..b3fe2d59cd13 100644
--- a/trunk/drivers/media/video/cx88/cx88.h
+++ b/trunk/drivers/media/video/cx88/cx88.h
@@ -32,7 +32,7 @@
 #include <media/cx2341x.h>
 #include <media/audiochip.h>
 #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
-#include <media/video-buf-dvb.h>
+#include <media/videobuf-dvb.h>
 #endif
 
 #include "btcx-risc.h"
diff --git a/trunk/drivers/media/video/saa7134/saa7134.h b/trunk/drivers/media/video/saa7134/saa7134.h
index dae608f9bf3b..cb617c8dbb71 100644
--- a/trunk/drivers/media/video/saa7134/saa7134.h
+++ b/trunk/drivers/media/video/saa7134/saa7134.h
@@ -42,7 +42,7 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
-#include <media/video-buf-dvb.h>
+#include <media/videobuf-dvb.h>
 #endif
 
 #define UNSET (-1U)
diff --git a/trunk/drivers/media/video/video-buf-dvb.c b/trunk/drivers/media/video/videobuf-dvb.c
similarity index 99%
rename from trunk/drivers/media/video/video-buf-dvb.c
rename to trunk/drivers/media/video/videobuf-dvb.c
index 9631ead297ee..880317e04a02 100644
--- a/trunk/drivers/media/video/video-buf-dvb.c
+++ b/trunk/drivers/media/video/videobuf-dvb.c
@@ -23,7 +23,7 @@
 #include <linux/freezer.h>
 
 #include <media/videobuf-dma-sg.h>
-#include <media/video-buf-dvb.h>
+#include <media/videobuf-dvb.h>
 
 /* ------------------------------------------------------------------ */
 
diff --git a/trunk/include/media/video-buf-dvb.h b/trunk/include/media/videobuf-dvb.h
similarity index 100%
rename from trunk/include/media/video-buf-dvb.h
rename to trunk/include/media/videobuf-dvb.h