V4L/DVB (6257): Rename video-buf-dvb to videobuf-dvb to be consistent with the other...

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index c8140aec1a16995e87ab3190b22ec80d7178f4e8..b5a064163e03f49231cd957db20790a11c19ac68 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/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/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 875a9abab2a2d0432de54ef07b061fce557189c2..b3fe2d59cd13c113e34176079e62e1bf0b5c2a9a 100644 (file)
--- a/drivers/media/video/cx88/cx88.h
+++ b/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/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index dae608f9bf3b72a8a485d5e29145bb6b6090466a..cb617c8dbb716a3c71df58e7512df80eae07ac2e 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/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/drivers/media/video/video-buf-dvb.c b/drivers/media/video/videobuf-dvb.c
similarity index 99%
rename from drivers/media/video/video-buf-dvb.c
rename to drivers/media/video/videobuf-dvb.c
index 9631ead297ee52d9bcbfcaa65bc66b836f1ebfd7..880317e04a02ba057462955235910bf109428708 100644 (file)
--- a/drivers/media/video/video-buf-dvb.c
+++ b/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/include/media/video-buf-dvb.h b/include/media/videobuf-dvb.h
similarity index 100%
rename from include/media/video-buf-dvb.h
rename to include/media/videobuf-dvb.h