diff options
| -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 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 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 index 8233cafdeef..8233cafdeef 100644 --- a/include/media/video-buf-dvb.h +++ b/include/media/videobuf-dvb.h |