---

yaml --- r: 65922 b: refs/heads/master c: ba366a2 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 1de5091 · 1de5091
1 parent 59a7725
commit 1de5091
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → trunk/drivers/media/video/videobuf-dvb.c b/trunk/drivers/media/video/video-buf-dvb.c → 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 → trunk/include/media/videobuf-dvb.h b/trunk/include/media/video-buf-dvb.h → trunk/include/media/videobuf-dvb.h