diff options
21 files changed, 23 insertions, 25 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index 2ed590fc87c1..0f823e82d5e3 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c @@ -36,7 +36,6 @@ #include <asm/io.h> #include "bttvp.h" -#include "tuner.h" #include "bt832.h" /* fwd decl */ diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index b9d3949f9857..ed8d3b0f03f6 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c @@ -37,7 +37,6 @@ #include <asm/io.h> #include "bttvp.h" -#include "tuner.h" int bttv_num; /* number of Bt848s in use */ struct bttv bttvs[BTTV_MAX]; diff --git a/drivers/media/video/bttv-if.c b/drivers/media/video/bttv-if.c index 01ea37beac5f..1b3c83e16fe0 100644 --- a/drivers/media/video/bttv-if.c +++ b/drivers/media/video/bttv-if.c @@ -34,7 +34,6 @@ #include <asm/io.h> #include "bttvp.h" -#include "tuner.h" static struct i2c_algo_bit_data bttv_i2c_algo_template; static struct i2c_adapter bttv_i2c_adap_template; diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 49882b03769e..65f8d54e1816 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h @@ -34,10 +34,12 @@ #include <linux/pci.h> #include <asm/scatterlist.h> +#include <media/video-buf.h> +#include <media/audiochip.h> +#include <media/tuner.h> + #include "bt848.h" #include "bttv.h" -#include "video-buf.h" -#include "audiochip.h" #ifdef __KERNEL__ diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index 7defb547b12c..9000e6f107c3 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c @@ -56,7 +56,7 @@ #define __KERNEL_SYSCALLS__ #include <linux/unistd.h> -#include "audiochip.h" +#include <media/audiochip.h> #include "msp3400.h" /* Addresses to scan */ diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index bc8b98bfd062..d2d58ec70da1 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c @@ -24,7 +24,6 @@ #include "saa7134-reg.h" #include "saa7134.h" -#include "tuner.h" /* commly used strings */ static char name_mute[] = "mute"; diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 07b31bc2f848..e88367522cdb 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c @@ -30,7 +30,6 @@ #include "saa7134-reg.h" #include "saa7134.h" -#include "tuner.h" MODULE_DESCRIPTION("v4l2 driver module for saa7130/34 based TV cards"); MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 438ee56ae0c3..72463f5cb7b3 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c @@ -30,8 +30,6 @@ #include "saa7134-reg.h" #include "saa7134.h" -#include "tuner.h" -#include "id.h" /* ----------------------------------------------------------- */ diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 562ebf3332ee..9d22bf8a348b 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c @@ -29,8 +29,6 @@ #include "saa7134-reg.h" #include "saa7134.h" -#include "tuner.h" -#include "audiochip.h" /* ------------------------------------------------------------------ */ diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index aa3ef2596b62..57f1fc42ed0a 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h @@ -22,7 +22,11 @@ #include <linux/i2c.h> #include <linux/videodev.h> #include <linux/kdev_t.h> -#include "video-buf.h" + +#include <media/video-buf.h> +#include <media/tuner.h> +#include <media/audiochip.h> +#include <media/id.h> #define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,2) diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c index 4b96ec8af1f7..8ba55c0a6644 100644 --- a/drivers/media/video/tda7432.c +++ b/drivers/media/video/tda7432.c @@ -49,8 +49,8 @@ #include <linux/i2c-algo-bit.h> #include "bttv.h" -#include "audiochip.h" -#include "id.h" +#include <media/audiochip.h> +#include <media/id.h> #ifndef VIDEO_AUDIO_BALANCE # define VIDEO_AUDIO_BALANCE 32 diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index 51b41a008484..28a9c2f60c7d 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c @@ -31,8 +31,8 @@ #include <linux/init.h> #include "bttv.h" -#include "audiochip.h" -#include "id.h" +#include <media/audiochip.h> +#include <media/id.h> MODULE_PARM(debug,"i"); MODULE_LICENSE("GPL"); diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 3d8c6fa0b20f..fb20ba56c24e 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c @@ -7,8 +7,8 @@ #include <linux/errno.h> #include <linux/slab.h> -#include "id.h" -#include "audiochip.h" +#include <media/audiochip.h> +#include <media/id.h> /* Chips: TDA9885 (PAL, NTSC) diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c index 4319f317cb30..5c4328d6a1ab 100644 --- a/drivers/media/video/tuner-3036.c +++ b/drivers/media/video/tuner-3036.c @@ -27,7 +27,7 @@ #include <linux/i2c.h> #include <linux/videodev.h> -#include "tuner.h" +#include <media/tuner.h> static int debug; /* insmod parameter */ static int this_adap; diff --git a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c index 0638747257c5..f83309c257d8 100644 --- a/drivers/media/video/tuner.c +++ b/drivers/media/video/tuner.c @@ -12,8 +12,8 @@ #include <linux/videodev.h> #include <linux/init.h> -#include "tuner.h" -#include "audiochip.h" +#include <media/tuner.h> +#include <media/audiochip.h> /* Addresses to scan */ static unsigned short normal_i2c[] = {I2C_CLIENT_END}; diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 9bd14e322539..bf68fc0d6874 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c @@ -29,9 +29,10 @@ #include <linux/init.h> #include <linux/smp_lock.h> -#include "audiochip.h" +#include <media/audiochip.h> +#include <media/id.h> + #include "tvaudio.h" -#include "id.h" /* ---------------------------------------------------------------------- */ diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index 20e2c2e6f692..36c155bfd42f 100644 --- a/drivers/media/video/video-buf.c +++ b/drivers/media/video/video-buf.c @@ -31,7 +31,7 @@ # define TryLockPage TestSetPageLocked #endif -#include "video-buf.h" +#include <media/video-buf.h> static int debug = 0; diff --git a/drivers/media/video/audiochip.h b/include/media/audiochip.h index e5a5cd2bb172..e5a5cd2bb172 100644 --- a/drivers/media/video/audiochip.h +++ b/include/media/audiochip.h diff --git a/drivers/media/video/id.h b/include/media/id.h index f9360b0665bb..f9360b0665bb 100644 --- a/drivers/media/video/id.h +++ b/include/media/id.h diff --git a/drivers/media/video/tuner.h b/include/media/tuner.h index f716e23dda8e..f716e23dda8e 100644 --- a/drivers/media/video/tuner.h +++ b/include/media/tuner.h diff --git a/drivers/media/video/video-buf.h b/include/media/video-buf.h index fceea3e24f75..fceea3e24f75 100644 --- a/drivers/media/video/video-buf.h +++ b/include/media/video-buf.h |