diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-23 17:12:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 23:02:46 -0400 |
commit | ba366a23b68029fc8560acf1ad8735eed910f962 (patch) | |
tree | 49155a40b2d6e438c57fd68cb803a073d8b7990f | |
parent | 79618cf41337ccedb9abeee059ce76aac7962739 (diff) |
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>
-rw-r--r-- | drivers/media/video/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dvb.c (renamed from drivers/media/video/video-buf-dvb.c) | 2 | ||||
-rw-r--r-- | include/media/videobuf-dvb.h (renamed from include/media/video-buf-dvb.h) | 0 |
5 files changed, 4 insertions, 4 deletions
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 | |||
90 | obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o | 90 | obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o |
91 | obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o | 91 | obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o |
92 | obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o | 92 | obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o |
93 | obj-$(CONFIG_VIDEO_BUF_DVB) += video-buf-dvb.o | 93 | obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o |
94 | obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o | 94 | obj-$(CONFIG_VIDEO_BTCX) += btcx-risc.o |
95 | obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o | 95 | obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o |
96 | 96 | ||
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 @@ | |||
32 | #include <media/cx2341x.h> | 32 | #include <media/cx2341x.h> |
33 | #include <media/audiochip.h> | 33 | #include <media/audiochip.h> |
34 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) | 34 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) |
35 | #include <media/video-buf-dvb.h> | 35 | #include <media/videobuf-dvb.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #include "btcx-risc.h" | 38 | #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 @@ | |||
42 | #include <sound/core.h> | 42 | #include <sound/core.h> |
43 | #include <sound/pcm.h> | 43 | #include <sound/pcm.h> |
44 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) | 44 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) |
45 | #include <media/video-buf-dvb.h> | 45 | #include <media/videobuf-dvb.h> |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #define UNSET (-1U) | 48 | #define UNSET (-1U) |
diff --git a/drivers/media/video/video-buf-dvb.c b/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 @@ | |||
23 | #include <linux/freezer.h> | 23 | #include <linux/freezer.h> |
24 | 24 | ||
25 | #include <media/videobuf-dma-sg.h> | 25 | #include <media/videobuf-dma-sg.h> |
26 | #include <media/video-buf-dvb.h> | 26 | #include <media/videobuf-dvb.h> |
27 | 27 | ||
28 | /* ------------------------------------------------------------------ */ | 28 | /* ------------------------------------------------------------------ */ |
29 | 29 | ||
diff --git a/include/media/video-buf-dvb.h b/include/media/videobuf-dvb.h index 8233cafdeef..8233cafdeef 100644 --- a/include/media/video-buf-dvb.h +++ b/include/media/videobuf-dvb.h | |||