From ba366a23b68029fc8560acf1ad8735eed910f962 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 23 Aug 2007 18:12:08 -0300
Subject: [PATCH] V4L/DVB (6257): Rename video-buf-dvb to videobuf-dvb to be
 consistent with the other patches

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 drivers/media/video/Makefile                            | 2 +-
 drivers/media/video/cx88/cx88.h                         | 2 +-
 drivers/media/video/saa7134/saa7134.h                   | 2 +-
 drivers/media/video/{video-buf-dvb.c => videobuf-dvb.c} | 2 +-
 include/media/{video-buf-dvb.h => videobuf-dvb.h}       | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename drivers/media/video/{video-buf-dvb.c => videobuf-dvb.c} (99%)
 rename include/media/{video-buf-dvb.h => videobuf-dvb.h} (100%)

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index c8140aec1a1..b5a064163e0 100644
--- 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 875a9abab2a..b3fe2d59cd1 100644
--- 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 dae608f9bf3..cb617c8dbb7 100644
--- 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 9631ead297e..880317e04a0 100644
--- 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