summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-23 18:12:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-23 18:12:08 -0300
commitc3220ca3a955b5791845c822fabf476e987445ab (patch)
treeed76d089bd0e93ef13b53f811ae12eac31730890
parent45ff1cf8db02db5be4363bf799a3adfc94e87de9 (diff)
downloadmediapointer-dvb-s2-c3220ca3a955b5791845c822fabf476e987445ab.tar.gz
mediapointer-dvb-s2-c3220ca3a955b5791845c822fabf476e987445ab.tar.bz2
Rename video-buf-dvb to videobuf-dvb to be consistent with the other patches
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/video/Makefile2
-rw-r--r--linux/drivers/media/video/cx88/cx88.h2
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h2
-rw-r--r--linux/drivers/media/video/videobuf-dvb.c (renamed from linux/drivers/media/video/video-buf-dvb.c)0
-rw-r--r--linux/include/media/videobuf-dvb.h (renamed from linux/include/media/video-buf-dvb.h)0
5 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index c8140aec1..b5a064163 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/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/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index f5efc3fb4..e7869cf22 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/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 "compat.h"
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 616d62260..3c208c5a1 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -49,7 +49,7 @@
#include <sound/pcm.h>
#endif
#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/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/videobuf-dvb.c
index 94970f693..94970f693 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/videobuf-dvb.c
diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/videobuf-dvb.h
index 92545a0a2..92545a0a2 100644
--- a/linux/include/media/video-buf-dvb.h
+++ b/linux/include/media/videobuf-dvb.h