diff options
Diffstat (limited to 'linux/drivers')
43 files changed, 44 insertions, 4 deletions
diff --git a/linux/drivers/media/radio/miropcm20-radio.c b/linux/drivers/media/radio/miropcm20-radio.c index 5bf45ec4c..ef9a9886b 100644 --- a/linux/drivers/media/radio/miropcm20-radio.c +++ b/linux/drivers/media/radio/miropcm20-radio.c @@ -23,7 +23,8 @@ #include <linux/init.h> #include "compat.h" #include <linux/videodev.h> -#include "oss/aci.h" +#include <media/v4l2-common.h> +#include <oss/aci.h> #include "miropcm20-rds-core.h" static int radio_nr = -1; diff --git a/linux/drivers/media/radio/radio-aimslab.c b/linux/drivers/media/radio/radio-aimslab.c index c167f19c0..d4fc66948 100644 --- a/linux/drivers/media/radio/radio-aimslab.c +++ b/linux/drivers/media/radio/radio-aimslab.c @@ -35,6 +35,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_RTRACK_PORT */ #include <asm/semaphore.h> /* Lock for the I/O */ diff --git a/linux/drivers/media/radio/radio-aztech.c b/linux/drivers/media/radio/radio-aztech.c index 4a06891d8..cfce2c89d 100644 --- a/linux/drivers/media/radio/radio-aztech.c +++ b/linux/drivers/media/radio/radio-aztech.c @@ -32,6 +32,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_AZTECH_PORT */ /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ diff --git a/linux/drivers/media/radio/radio-cadet.c b/linux/drivers/media/radio/radio-cadet.c index 9866c3860..bad7dcadc 100644 --- a/linux/drivers/media/radio/radio-cadet.c +++ b/linux/drivers/media/radio/radio-cadet.c @@ -35,6 +35,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/param.h> #include <linux/pnp.h> diff --git a/linux/drivers/media/radio/radio-gemtek-pci.c b/linux/drivers/media/radio/radio-gemtek-pci.c index 40a50a628..4afe9fb25 100644 --- a/linux/drivers/media/radio/radio-gemtek-pci.c +++ b/linux/drivers/media/radio/radio-gemtek-pci.c @@ -45,6 +45,7 @@ #include <linux/pci.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/linux/drivers/media/radio/radio-gemtek.c b/linux/drivers/media/radio/radio-gemtek.c index 5b3ef00a9..f4b324148 100644 --- a/linux/drivers/media/radio/radio-gemtek.c +++ b/linux/drivers/media/radio/radio-gemtek.c @@ -23,6 +23,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_GEMTEK_PORT */ #include <linux/spinlock.h> diff --git a/linux/drivers/media/radio/radio-maestro.c b/linux/drivers/media/radio/radio-maestro.c index 0a1ea1ce7..972521d59 100644 --- a/linux/drivers/media/radio/radio-maestro.c +++ b/linux/drivers/media/radio/radio-maestro.c @@ -29,7 +29,7 @@ #endif #include <linux/pci.h> #include <linux/videodev.h> - +#include <media/v4l2-common.h> #define DRIVER_VERSION "0.05" diff --git a/linux/drivers/media/radio/radio-maxiradio.c b/linux/drivers/media/radio/radio-maxiradio.c index d9bfe3f32..a763e5630 100644 --- a/linux/drivers/media/radio/radio-maxiradio.c +++ b/linux/drivers/media/radio/radio-maxiradio.c @@ -44,6 +44,7 @@ #include <linux/pci.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> /* version 0.75 Sun Feb 4 22:51:27 EET 2001 */ #define DRIVER_VERSION "0.75" diff --git a/linux/drivers/media/radio/radio-rtrack2.c b/linux/drivers/media/radio/radio-rtrack2.c index cba2fd028..c506262c4 100644 --- a/linux/drivers/media/radio/radio-rtrack2.c +++ b/linux/drivers/media/radio/radio-rtrack2.c @@ -16,6 +16,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_RTRACK2_PORT */ #include <linux/spinlock.h> diff --git a/linux/drivers/media/radio/radio-sf16fmi.c b/linux/drivers/media/radio/radio-sf16fmi.c index 928ac9b2d..68ff1782d 100644 --- a/linux/drivers/media/radio/radio-sf16fmi.c +++ b/linux/drivers/media/radio/radio-sf16fmi.c @@ -22,6 +22,7 @@ #include <linux/delay.h> /* udelay */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/isapnp.h> #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ diff --git a/linux/drivers/media/radio/radio-sf16fmr2.c b/linux/drivers/media/radio/radio-sf16fmr2.c index 0bafd3267..b292fe54e 100644 --- a/linux/drivers/media/radio/radio-sf16fmr2.c +++ b/linux/drivers/media/radio/radio-sf16fmr2.c @@ -20,6 +20,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> diff --git a/linux/drivers/media/radio/radio-terratec.c b/linux/drivers/media/radio/radio-terratec.c index c2406e6e6..a12c5e6de 100644 --- a/linux/drivers/media/radio/radio-terratec.c +++ b/linux/drivers/media/radio/radio-terratec.c @@ -31,6 +31,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_TERRATEC_PORT */ #include <linux/spinlock.h> diff --git a/linux/drivers/media/radio/radio-trust.c b/linux/drivers/media/radio/radio-trust.c index eedadaf66..40ca85954 100644 --- a/linux/drivers/media/radio/radio-trust.c +++ b/linux/drivers/media/radio/radio-trust.c @@ -23,6 +23,7 @@ #include <asm/uaccess.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_TRUST_PORT */ /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ diff --git a/linux/drivers/media/radio/radio-typhoon.c b/linux/drivers/media/radio/radio-typhoon.c index 02cc2c093..519899793 100644 --- a/linux/drivers/media/radio/radio-typhoon.c +++ b/linux/drivers/media/radio/radio-typhoon.c @@ -37,6 +37,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_TYPHOON_* */ #define BANNER "Typhoon Radio Card driver v0.1\n" diff --git a/linux/drivers/media/radio/radio-zoltrix.c b/linux/drivers/media/radio/radio-zoltrix.c index e8363cf6b..0f7e54952 100644 --- a/linux/drivers/media/radio/radio-zoltrix.c +++ b/linux/drivers/media/radio/radio-zoltrix.c @@ -34,6 +34,7 @@ #include <asm/uaccess.h> /* copy to/from user */ #include "compat.h" #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_ZOLTRIX_PORT */ #ifndef CONFIG_RADIO_ZOLTRIX_PORT diff --git a/linux/drivers/media/video/arv.c b/linux/drivers/media/video/arv.c index af3980d95..6c82b2fef 100644 --- a/linux/drivers/media/video/arv.c +++ b/linux/drivers/media/video/arv.c @@ -32,6 +32,7 @@ #include <linux/sched.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> #include <asm/uaccess.h> diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index 6c41e1e2e..2d3178df5 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -34,6 +34,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/pci.h> #include <linux/input.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) diff --git a/linux/drivers/media/video/bw-qcam.c b/linux/drivers/media/video/bw-qcam.c index 9941128b9..108612e1f 100644 --- a/linux/drivers/media/video/bw-qcam.c +++ b/linux/drivers/media/video/bw-qcam.c @@ -74,6 +74,7 @@ OTHER DEALINGS IN THE SOFTWARE. #include <linux/sched.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif diff --git a/linux/drivers/media/video/c-qcam.c b/linux/drivers/media/video/c-qcam.c index 2dbd848c4..f535db726 100644 --- a/linux/drivers/media/video/c-qcam.c +++ b/linux/drivers/media/video/c-qcam.c @@ -35,6 +35,7 @@ #include <linux/sched.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif diff --git a/linux/drivers/media/video/cpia.h b/linux/drivers/media/video/cpia.h index b8539f244..d4f61b037 100644 --- a/linux/drivers/media/video/cpia.h +++ b/linux/drivers/media/video/cpia.h @@ -46,6 +46,7 @@ #include <asm/uaccess.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/list.h> #include <linux/smp_lock.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) diff --git a/linux/drivers/media/video/cpia2/cpia2.h b/linux/drivers/media/video/cpia2/cpia2.h index cfbafc02d..b7226a418 100644 --- a/linux/drivers/media/video/cpia2/cpia2.h +++ b/linux/drivers/media/video/cpia2/cpia2.h @@ -33,6 +33,7 @@ #include <linux/version.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/poll.h> diff --git a/linux/drivers/media/video/dsbr100.c b/linux/drivers/media/video/dsbr100.c index a4cee9886..45d2b5028 100644 --- a/linux/drivers/media/video/dsbr100.c +++ b/linux/drivers/media/video/dsbr100.c @@ -73,6 +73,7 @@ #include <linux/input.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/smp_lock.h> diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c index a494fccd2..e9bd1724f 100644 --- a/linux/drivers/media/video/meye.c +++ b/linux/drivers/media/video/meye.c @@ -33,6 +33,7 @@ #include <linux/init.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <asm/uaccess.h> #include <asm/io.h> #include <linux/delay.h> diff --git a/linux/drivers/media/video/ov511.h b/linux/drivers/media/video/ov511.h index 3f5078a85..1749665fc 100644 --- a/linux/drivers/media/video/ov511.h +++ b/linux/drivers/media/video/ov511.h @@ -4,6 +4,7 @@ #include <asm/uaccess.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/smp_lock.h> #include <linux/usb.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) diff --git a/linux/drivers/media/video/planb.c b/linux/drivers/media/video/planb.c index 3cfdb504d..baa0c55a7 100644 --- a/linux/drivers/media/video/planb.c +++ b/linux/drivers/media/video/planb.c @@ -41,6 +41,7 @@ #include <linux/sched.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/wait.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/linux/drivers/media/video/pms.c b/linux/drivers/media/video/pms.c index e5d16a5d0..d129072a9 100644 --- a/linux/drivers/media/video/pms.c +++ b/linux/drivers/media/video/pms.c @@ -31,6 +31,7 @@ #include <linux/sched.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index 1fd8c34d1..a087108d0 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -35,7 +35,7 @@ #include <asm/semaphore.h> #include <asm/errno.h> #include <linux/videodev.h> -#include <linux/videodev2.h> +#include <media/v4l2-common.h> #include "pwc-uncompress.h" #include <media/pwc-ioctl.h> diff --git a/linux/drivers/media/video/saa5246a.c b/linux/drivers/media/video/saa5246a.c index 7aa9134a8..5677a9173 100644 --- a/linux/drivers/media/video/saa5246a.c +++ b/linux/drivers/media/video/saa5246a.c @@ -47,6 +47,7 @@ #include <linux/videotext.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif diff --git a/linux/drivers/media/video/saa5249.c b/linux/drivers/media/video/saa5249.c index 6fd6e1626..e35e4f9a3 100644 --- a/linux/drivers/media/video/saa5249.c +++ b/linux/drivers/media/video/saa5249.c @@ -57,6 +57,7 @@ #include <linux/videotext.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif diff --git a/linux/drivers/media/video/saa7110.c b/linux/drivers/media/video/saa7110.c index b1797cbb6..9ee45f77c 100644 --- a/linux/drivers/media/video/saa7110.c +++ b/linux/drivers/media/video/saa7110.c @@ -44,6 +44,7 @@ MODULE_LICENSE("GPL"); #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/video_decoder.h> static int debug = 0; diff --git a/linux/drivers/media/video/se401.h b/linux/drivers/media/video/se401.h index bf14af36d..9fd8485f3 100644 --- a/linux/drivers/media/video/se401.h +++ b/linux/drivers/media/video/se401.h @@ -5,6 +5,7 @@ #include <asm/uaccess.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/smp_lock.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> diff --git a/linux/drivers/media/video/stradis.c b/linux/drivers/media/video/stradis.c index f4be8c6af..40ebe8adf 100644 --- a/linux/drivers/media/video/stradis.c +++ b/linux/drivers/media/video/stradis.c @@ -43,6 +43,7 @@ #include <linux/vmalloc.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include "saa7146.h" #include "saa7146reg.h" diff --git a/linux/drivers/media/video/stv680.c b/linux/drivers/media/video/stv680.c index f0d5bd79b..1bd4bd4e4 100644 --- a/linux/drivers/media/video/stv680.c +++ b/linux/drivers/media/video/stv680.c @@ -67,6 +67,7 @@ #include <linux/errno.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c index e97d2b59d..42f28e6b0 100644 --- a/linux/drivers/media/video/tda9875.c +++ b/linux/drivers/media/video/tda9875.c @@ -27,6 +27,7 @@ #include <linux/slab.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/init.h> diff --git a/linux/drivers/media/video/tuner-3036.c b/linux/drivers/media/video/tuner-3036.c index 545f54eaa..8b87d75f4 100644 --- a/linux/drivers/media/video/tuner-3036.c +++ b/linux/drivers/media/video/tuner-3036.c @@ -26,6 +26,7 @@ #include <linux/i2c.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <media/tuner.h> diff --git a/linux/drivers/media/video/usbvideo/usbvideo.h b/linux/drivers/media/video/usbvideo/usbvideo.h index de266e78a..d5bb0c747 100644 --- a/linux/drivers/media/video/usbvideo/usbvideo.h +++ b/linux/drivers/media/video/usbvideo/usbvideo.h @@ -19,6 +19,7 @@ #include <linux/config.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c index ea5936087..d6c47a210 100644 --- a/linux/drivers/media/video/v4l1-compat.c +++ b/linux/drivers/media/video/v4l1-compat.c @@ -33,6 +33,7 @@ #include <linux/errno.h> #include <linux/slab.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <asm/uaccess.h> #include <asm/system.h> diff --git a/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c index a739919ba..a196756c5 100644 --- a/linux/drivers/media/video/vino.c +++ b/linux/drivers/media/video/vino.c @@ -40,7 +40,7 @@ #include <linux/i2c-algo-sgi.h> #include <linux/videodev.h> -#include <linux/videodev2.h> +#include <media/v4l2-common.h> #include <linux/video_decoder.h> #include <linux/mutex.h> diff --git a/linux/drivers/media/video/vpx3220.c b/linux/drivers/media/video/vpx3220.c index a34b47326..ad92a39a8 100644 --- a/linux/drivers/media/video/vpx3220.c +++ b/linux/drivers/media/video/vpx3220.c @@ -35,6 +35,7 @@ #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/video_decoder.h> #define I2C_VPX3220 0x86 diff --git a/linux/drivers/media/video/w9966.c b/linux/drivers/media/video/w9966.c index d24d4ca3d..6a5c6303d 100644 --- a/linux/drivers/media/video/w9966.c +++ b/linux/drivers/media/video/w9966.c @@ -59,6 +59,7 @@ #include <linux/delay.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/parport.h> //#define DEBUG // Undef me for production diff --git a/linux/drivers/media/video/zoran_card.c b/linux/drivers/media/video/zoran_card.c index cc52eb745..655a7b78b 100644 --- a/linux/drivers/media/video/zoran_card.c +++ b/linux/drivers/media/video/zoran_card.c @@ -41,6 +41,7 @@ #include <linux/i2c-algo-bit.h> #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/spinlock.h> #include <linux/sem.h> #include <linux/kmod.h> diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c index 20a296871..6ed4a89da 100644 --- a/linux/drivers/media/video/zoran_driver.c +++ b/linux/drivers/media/video/zoran_driver.c @@ -73,6 +73,7 @@ ) #include <linux/videodev.h> +#include <media/v4l2-common.h> #include "videocodec.h" #include <asm/io.h> diff --git a/linux/drivers/media/video/zoran_procfs.c b/linux/drivers/media/video/zoran_procfs.c index 3472c00d4..d60be18d9 100644 --- a/linux/drivers/media/video/zoran_procfs.c +++ b/linux/drivers/media/video/zoran_procfs.c @@ -44,6 +44,7 @@ #include <linux/seq_file.h> #include <linux/ctype.h> +#include <linux/poll.h> #include <asm/io.h> #include "videocodec.h" |