aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-05 09:26:32 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:05 -0400
commit5e87efa3b29c105f81fea785babafb098e4e046d (patch)
tree7782d36699174e5985ee7ddca3860df130b0bbbb
parent839e4a4acb90fd34e3f6765bef6fe03ee82dbc58 (diff)
V4L/DVB (4068): Removed all references to kernel stuff from videodev.h and videodev2.h
The videodev.h and videodev2.h describe the public API for V4L and V4L2. It shouldn't have there any kernel-specific stuff. Those were moved to v4l2-dev.h. This patch removes some uneeded headers and include v4l2-common.h on all V4L driver. This header includes device implementation of V4L2 API provided on v4l2-dev.h as well as V4L2 internal ioctls that provides connections between master driver and its i2c devices. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/radio/miropcm20-radio.c1
-rw-r--r--drivers/media/radio/radio-aimslab.c1
-rw-r--r--drivers/media/radio/radio-aztech.c1
-rw-r--r--drivers/media/radio/radio-cadet.c1
-rw-r--r--drivers/media/radio/radio-gemtek-pci.c1
-rw-r--r--drivers/media/radio/radio-gemtek.c1
-rw-r--r--drivers/media/radio/radio-maestro.c2
-rw-r--r--drivers/media/radio/radio-maxiradio.c1
-rw-r--r--drivers/media/radio/radio-rtrack2.c1
-rw-r--r--drivers/media/radio/radio-sf16fmi.c1
-rw-r--r--drivers/media/radio/radio-sf16fmr2.c1
-rw-r--r--drivers/media/radio/radio-terratec.c1
-rw-r--r--drivers/media/radio/radio-trust.c1
-rw-r--r--drivers/media/radio/radio-typhoon.c1
-rw-r--r--drivers/media/radio/radio-zoltrix.c1
-rw-r--r--drivers/media/video/arv.c1
-rw-r--r--drivers/media/video/bt8xx/bttvp.h1
-rw-r--r--drivers/media/video/bw-qcam.c1
-rw-r--r--drivers/media/video/c-qcam.c1
-rw-r--r--drivers/media/video/cpia.h1
-rw-r--r--drivers/media/video/cpia2/cpia2.h1
-rw-r--r--drivers/media/video/dsbr100.c1
-rw-r--r--drivers/media/video/meye.c1
-rw-r--r--drivers/media/video/ov511.h1
-rw-r--r--drivers/media/video/planb.c1
-rw-r--r--drivers/media/video/pms.c1
-rw-r--r--drivers/media/video/pwc/pwc.h2
-rw-r--r--drivers/media/video/saa5246a.c1
-rw-r--r--drivers/media/video/saa5249.c1
-rw-r--r--drivers/media/video/saa7110.c1
-rw-r--r--drivers/media/video/se401.h1
-rw-r--r--drivers/media/video/stradis.c1
-rw-r--r--drivers/media/video/stv680.c1
-rw-r--r--drivers/media/video/tda9875.c1
-rw-r--r--drivers/media/video/tuner-3036.c1
-rw-r--r--drivers/media/video/usbvideo/usbvideo.h1
-rw-r--r--drivers/media/video/v4l1-compat.c1
-rw-r--r--drivers/media/video/vino.c2
-rw-r--r--drivers/media/video/vpx3220.c1
-rw-r--r--drivers/media/video/w9966.c1
-rw-r--r--drivers/media/video/zoran_card.c1
-rw-r--r--drivers/media/video/zoran_driver.c1
-rw-r--r--drivers/media/video/zoran_procfs.c1
-rw-r--r--include/linux/videodev.h11
-rw-r--r--include/linux/videodev2.h18
-rw-r--r--include/media/ovcamchip.h1
-rw-r--r--include/media/saa7146_vv.h2
-rw-r--r--include/media/v4l2-dev.h8
48 files changed, 52 insertions, 34 deletions
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 7765c6a0cfe6..c4312fa0e2f5 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -22,6 +22,7 @@
22#include <linux/module.h> 22#include <linux/module.h>
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/videodev.h> 24#include <linux/videodev.h>
25#include <media/v4l2-common.h>
25#include "oss/aci.h" 26#include "oss/aci.h"
26#include "miropcm20-rds-core.h" 27#include "miropcm20-rds-core.h"
27 28
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 36119d77f868..df22a582e7a2 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -34,6 +34,7 @@
34#include <asm/io.h> /* outb, outb_p */ 34#include <asm/io.h> /* outb, outb_p */
35#include <asm/uaccess.h> /* copy to/from user */ 35#include <asm/uaccess.h> /* copy to/from user */
36#include <linux/videodev.h> /* kernel radio structs */ 36#include <linux/videodev.h> /* kernel radio structs */
37#include <media/v4l2-common.h>
37#include <linux/config.h> /* CONFIG_RADIO_RTRACK_PORT */ 38#include <linux/config.h> /* CONFIG_RADIO_RTRACK_PORT */
38#include <asm/semaphore.h> /* Lock for the I/O */ 39#include <asm/semaphore.h> /* Lock for the I/O */
39 40
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index ca676245c071..95e6322133ee 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -31,6 +31,7 @@
31#include <asm/io.h> /* outb, outb_p */ 31#include <asm/io.h> /* outb, outb_p */
32#include <asm/uaccess.h> /* copy to/from user */ 32#include <asm/uaccess.h> /* copy to/from user */
33#include <linux/videodev.h> /* kernel radio structs */ 33#include <linux/videodev.h> /* kernel radio structs */
34#include <media/v4l2-common.h>
34#include <linux/config.h> /* CONFIG_RADIO_AZTECH_PORT */ 35#include <linux/config.h> /* CONFIG_RADIO_AZTECH_PORT */
35 36
36/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ 37/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index c048454c7ba5..8641aec7baf8 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -34,6 +34,7 @@
34#include <asm/io.h> /* outb, outb_p */ 34#include <asm/io.h> /* outb, outb_p */
35#include <asm/uaccess.h> /* copy to/from user */ 35#include <asm/uaccess.h> /* copy to/from user */
36#include <linux/videodev.h> /* kernel radio structs */ 36#include <linux/videodev.h> /* kernel radio structs */
37#include <media/v4l2-common.h>
37#include <linux/param.h> 38#include <linux/param.h>
38#include <linux/pnp.h> 39#include <linux/pnp.h>
39 40
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index d5c3c4b878c7..9f249e7e60c9 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -44,6 +44,7 @@
44#include <linux/init.h> 44#include <linux/init.h>
45#include <linux/pci.h> 45#include <linux/pci.h>
46#include <linux/videodev.h> 46#include <linux/videodev.h>
47#include <media/v4l2-common.h>
47#include <linux/errno.h> 48#include <linux/errno.h>
48 49
49#include <asm/io.h> 50#include <asm/io.h>
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 77a1e12333a3..162f37d8bf96 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -22,6 +22,7 @@
22#include <asm/io.h> /* outb, outb_p */ 22#include <asm/io.h> /* outb, outb_p */
23#include <asm/uaccess.h> /* copy to/from user */ 23#include <asm/uaccess.h> /* copy to/from user */
24#include <linux/videodev.h> /* kernel radio structs */ 24#include <linux/videodev.h> /* kernel radio structs */
25#include <media/v4l2-common.h>
25#include <linux/config.h> /* CONFIG_RADIO_GEMTEK_PORT */ 26#include <linux/config.h> /* CONFIG_RADIO_GEMTEK_PORT */
26#include <linux/spinlock.h> 27#include <linux/spinlock.h>
27 28
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 2501792e1fa8..fcfa6c9fe225 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -26,7 +26,7 @@
26#include <linux/mutex.h> 26#include <linux/mutex.h>
27#include <linux/pci.h> 27#include <linux/pci.h>
28#include <linux/videodev.h> 28#include <linux/videodev.h>
29 29#include <media/v4l2-common.h>
30 30
31#define DRIVER_VERSION "0.05" 31#define DRIVER_VERSION "0.05"
32 32
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index fe2552569690..f93d7afe7304 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -41,6 +41,7 @@
41 41
42#include <linux/pci.h> 42#include <linux/pci.h>
43#include <linux/videodev.h> 43#include <linux/videodev.h>
44#include <media/v4l2-common.h>
44 45
45/* version 0.75 Sun Feb 4 22:51:27 EET 2001 */ 46/* version 0.75 Sun Feb 4 22:51:27 EET 2001 */
46#define DRIVER_VERSION "0.75" 47#define DRIVER_VERSION "0.75"
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 3821d25ed411..5b68ac4c7322 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -15,6 +15,7 @@
15#include <asm/io.h> /* outb, outb_p */ 15#include <asm/io.h> /* outb, outb_p */
16#include <asm/uaccess.h> /* copy to/from user */ 16#include <asm/uaccess.h> /* copy to/from user */
17#include <linux/videodev.h> /* kernel radio structs */ 17#include <linux/videodev.h> /* kernel radio structs */
18#include <media/v4l2-common.h>
18#include <linux/config.h> /* CONFIG_RADIO_RTRACK2_PORT */ 19#include <linux/config.h> /* CONFIG_RADIO_RTRACK2_PORT */
19#include <linux/spinlock.h> 20#include <linux/spinlock.h>
20 21
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 70cfbc3910dd..efee6e339d15 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -21,6 +21,7 @@
21#include <linux/ioport.h> /* request_region */ 21#include <linux/ioport.h> /* request_region */
22#include <linux/delay.h> /* udelay */ 22#include <linux/delay.h> /* udelay */
23#include <linux/videodev.h> /* kernel radio structs */ 23#include <linux/videodev.h> /* kernel radio structs */
24#include <media/v4l2-common.h>
24#include <linux/isapnp.h> 25#include <linux/isapnp.h>
25#include <asm/io.h> /* outb, outb_p */ 26#include <asm/io.h> /* outb, outb_p */
26#include <asm/uaccess.h> /* copy to/from user */ 27#include <asm/uaccess.h> /* copy to/from user */
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index ca560a4cd41f..3483b2c7bc9d 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -19,6 +19,7 @@
19#include <asm/io.h> /* outb, outb_p */ 19#include <asm/io.h> /* outb, outb_p */
20#include <asm/uaccess.h> /* copy to/from user */ 20#include <asm/uaccess.h> /* copy to/from user */
21#include <linux/videodev.h> /* kernel radio structs */ 21#include <linux/videodev.h> /* kernel radio structs */
22#include <media/v4l2-common.h>
22#include <linux/mutex.h> 23#include <linux/mutex.h>
23 24
24static struct mutex lock; 25static struct mutex lock;
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 3ac0c361b9a2..dfba4ae596cd 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -30,6 +30,7 @@
30#include <asm/io.h> /* outb, outb_p */ 30#include <asm/io.h> /* outb, outb_p */
31#include <asm/uaccess.h> /* copy to/from user */ 31#include <asm/uaccess.h> /* copy to/from user */
32#include <linux/videodev.h> /* kernel radio structs */ 32#include <linux/videodev.h> /* kernel radio structs */
33#include <media/v4l2-common.h>
33#include <linux/config.h> /* CONFIG_RADIO_TERRATEC_PORT */ 34#include <linux/config.h> /* CONFIG_RADIO_TERRATEC_PORT */
34#include <linux/spinlock.h> 35#include <linux/spinlock.h>
35 36
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index efcec0181c2c..8da4badc22b4 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -22,6 +22,7 @@
22#include <asm/io.h> 22#include <asm/io.h>
23#include <asm/uaccess.h> 23#include <asm/uaccess.h>
24#include <linux/videodev.h> 24#include <linux/videodev.h>
25#include <media/v4l2-common.h>
25#include <linux/config.h> /* CONFIG_RADIO_TRUST_PORT */ 26#include <linux/config.h> /* CONFIG_RADIO_TRUST_PORT */
26 27
27/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ 28/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index e42409906682..cf4fc08bd8a7 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -36,6 +36,7 @@
36#include <asm/io.h> /* outb, outb_p */ 36#include <asm/io.h> /* outb, outb_p */
37#include <asm/uaccess.h> /* copy to/from user */ 37#include <asm/uaccess.h> /* copy to/from user */
38#include <linux/videodev.h> /* kernel radio structs */ 38#include <linux/videodev.h> /* kernel radio structs */
39#include <media/v4l2-common.h>
39#include <linux/config.h> /* CONFIG_RADIO_TYPHOON_* */ 40#include <linux/config.h> /* CONFIG_RADIO_TYPHOON_* */
40 41
41#define BANNER "Typhoon Radio Card driver v0.1\n" 42#define BANNER "Typhoon Radio Card driver v0.1\n"
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 8aceea083980..59b86a6b4b0e 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -33,6 +33,7 @@
33#include <asm/io.h> /* outb, outb_p */ 33#include <asm/io.h> /* outb, outb_p */
34#include <asm/uaccess.h> /* copy to/from user */ 34#include <asm/uaccess.h> /* copy to/from user */
35#include <linux/videodev.h> /* kernel radio structs */ 35#include <linux/videodev.h> /* kernel radio structs */
36#include <media/v4l2-common.h>
36#include <linux/config.h> /* CONFIG_RADIO_ZOLTRIX_PORT */ 37#include <linux/config.h> /* CONFIG_RADIO_ZOLTRIX_PORT */
37 38
38#ifndef CONFIG_RADIO_ZOLTRIX_PORT 39#ifndef CONFIG_RADIO_ZOLTRIX_PORT
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index dbe025170599..53824cc229fa 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -31,6 +31,7 @@
31#include <linux/mm.h> 31#include <linux/mm.h>
32#include <linux/sched.h> 32#include <linux/sched.h>
33#include <linux/videodev.h> 33#include <linux/videodev.h>
34#include <media/v4l2-common.h>
34#include <linux/mutex.h> 35#include <linux/mutex.h>
35 36
36#include <asm/uaccess.h> 37#include <asm/uaccess.h>
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 4183a21cf161..d2956010f763 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -33,6 +33,7 @@
33#include <linux/i2c.h> 33#include <linux/i2c.h>
34#include <linux/i2c-algo-bit.h> 34#include <linux/i2c-algo-bit.h>
35#include <linux/videodev.h> 35#include <linux/videodev.h>
36#include <media/v4l2-common.h>
36#include <linux/pci.h> 37#include <linux/pci.h>
37#include <linux/input.h> 38#include <linux/input.h>
38#include <linux/mutex.h> 39#include <linux/mutex.h>
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index cf61c590f4ad..709c07cee290 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -73,6 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE.
73#include <linux/parport.h> 73#include <linux/parport.h>
74#include <linux/sched.h> 74#include <linux/sched.h>
75#include <linux/videodev.h> 75#include <linux/videodev.h>
76#include <media/v4l2-common.h>
76#include <linux/mutex.h> 77#include <linux/mutex.h>
77#include <asm/uaccess.h> 78#include <asm/uaccess.h>
78 79
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 22a7386bbea6..a3989bd2f81b 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -34,6 +34,7 @@
34#include <linux/parport.h> 34#include <linux/parport.h>
35#include <linux/sched.h> 35#include <linux/sched.h>
36#include <linux/videodev.h> 36#include <linux/videodev.h>
37#include <media/v4l2-common.h>
37#include <linux/mutex.h> 38#include <linux/mutex.h>
38 39
39#include <asm/uaccess.h> 40#include <asm/uaccess.h>
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index 3dc88b7558bf..6eaa692021c5 100644
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -45,6 +45,7 @@
45 45
46#include <asm/uaccess.h> 46#include <asm/uaccess.h>
47#include <linux/videodev.h> 47#include <linux/videodev.h>
48#include <media/v4l2-common.h>
48#include <linux/list.h> 49#include <linux/list.h>
49#include <linux/smp_lock.h> 50#include <linux/smp_lock.h>
50#include <linux/mutex.h> 51#include <linux/mutex.h>
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h
index 1764991b0ac9..c5ecb2be5f93 100644
--- a/drivers/media/video/cpia2/cpia2.h
+++ b/drivers/media/video/cpia2/cpia2.h
@@ -33,6 +33,7 @@
33 33
34#include <linux/version.h> 34#include <linux/version.h>
35#include <linux/videodev.h> 35#include <linux/videodev.h>
36#include <media/v4l2-common.h>
36#include <linux/usb.h> 37#include <linux/usb.h>
37#include <linux/poll.h> 38#include <linux/poll.h>
38 39
diff --git a/drivers/media/video/dsbr100.c b/drivers/media/video/dsbr100.c
index 3b4e9985c3d7..f7e33f9ee8e9 100644
--- a/drivers/media/video/dsbr100.c
+++ b/drivers/media/video/dsbr100.c
@@ -72,6 +72,7 @@
72#include <linux/slab.h> 72#include <linux/slab.h>
73#include <linux/input.h> 73#include <linux/input.h>
74#include <linux/videodev.h> 74#include <linux/videodev.h>
75#include <media/v4l2-common.h>
75#include <linux/usb.h> 76#include <linux/usb.h>
76#include <linux/smp_lock.h> 77#include <linux/smp_lock.h>
77 78
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 595a3ea7574e..f68ca7d9f531 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -32,6 +32,7 @@
32#include <linux/sched.h> 32#include <linux/sched.h>
33#include <linux/init.h> 33#include <linux/init.h>
34#include <linux/videodev.h> 34#include <linux/videodev.h>
35#include <media/v4l2-common.h>
35#include <asm/uaccess.h> 36#include <asm/uaccess.h>
36#include <asm/io.h> 37#include <asm/io.h>
37#include <linux/delay.h> 38#include <linux/delay.h>
diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 12b3d51e1c34..68b082bcee1d 100644
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -3,6 +3,7 @@
3 3
4#include <asm/uaccess.h> 4#include <asm/uaccess.h>
5#include <linux/videodev.h> 5#include <linux/videodev.h>
6#include <media/v4l2-common.h>
6#include <linux/smp_lock.h> 7#include <linux/smp_lock.h>
7#include <linux/usb.h> 8#include <linux/usb.h>
8#include <linux/mutex.h> 9#include <linux/mutex.h>
diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c
index d9e3cada52f4..3484e36b6801 100644
--- a/drivers/media/video/planb.c
+++ b/drivers/media/video/planb.c
@@ -40,6 +40,7 @@
40#include <linux/mm.h> 40#include <linux/mm.h>
41#include <linux/sched.h> 41#include <linux/sched.h>
42#include <linux/videodev.h> 42#include <linux/videodev.h>
43#include <media/v4l2-common.h>
43#include <linux/wait.h> 44#include <linux/wait.h>
44#include <asm/uaccess.h> 45#include <asm/uaccess.h>
45#include <asm/io.h> 46#include <asm/io.h>
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 09835ca098b1..fb6471e74dc5 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -30,6 +30,7 @@
30#include <asm/io.h> 30#include <asm/io.h>
31#include <linux/sched.h> 31#include <linux/sched.h>
32#include <linux/videodev.h> 32#include <linux/videodev.h>
33#include <media/v4l2-common.h>
33#include <linux/mutex.h> 34#include <linux/mutex.h>
34 35
35#include <asm/uaccess.h> 36#include <asm/uaccess.h>
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index 1fd8c34d1181..a087108d0e02 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -35,7 +35,7 @@
35#include <asm/semaphore.h> 35#include <asm/semaphore.h>
36#include <asm/errno.h> 36#include <asm/errno.h>
37#include <linux/videodev.h> 37#include <linux/videodev.h>
38#include <linux/videodev2.h> 38#include <media/v4l2-common.h>
39 39
40#include "pwc-uncompress.h" 40#include "pwc-uncompress.h"
41#include <media/pwc-ioctl.h> 41#include <media/pwc-ioctl.h>
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index dd830e0e5e96..59a187272c83 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -46,6 +46,7 @@
46#include <linux/i2c.h> 46#include <linux/i2c.h>
47#include <linux/videotext.h> 47#include <linux/videotext.h>
48#include <linux/videodev.h> 48#include <linux/videodev.h>
49#include <media/v4l2-common.h>
49#include <linux/mutex.h> 50#include <linux/mutex.h>
50 51
51#include "saa5246a.h" 52#include "saa5246a.h"
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 531e9461cb66..19a8d65699f8 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -56,6 +56,7 @@
56#include <linux/i2c.h> 56#include <linux/i2c.h>
57#include <linux/videotext.h> 57#include <linux/videotext.h>
58#include <linux/videodev.h> 58#include <linux/videodev.h>
59#include <media/v4l2-common.h>
59#include <linux/mutex.h> 60#include <linux/mutex.h>
60 61
61 62
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 41d951db6ec0..676b9970eb2e 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -43,6 +43,7 @@ MODULE_LICENSE("GPL");
43#define I2C_NAME(s) (s)->name 43#define I2C_NAME(s) (s)->name
44 44
45#include <linux/videodev.h> 45#include <linux/videodev.h>
46#include <media/v4l2-common.h>
46#include <linux/video_decoder.h> 47#include <linux/video_decoder.h>
47 48
48static int debug = 0; 49static int debug = 0;
diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h
index a7a216bd4413..c0891b3e0018 100644
--- a/drivers/media/video/se401.h
+++ b/drivers/media/video/se401.h
@@ -4,6 +4,7 @@
4 4
5#include <asm/uaccess.h> 5#include <asm/uaccess.h>
6#include <linux/videodev.h> 6#include <linux/videodev.h>
7#include <media/v4l2-common.h>
7#include <linux/smp_lock.h> 8#include <linux/smp_lock.h>
8#include <linux/mutex.h> 9#include <linux/mutex.h>
9 10
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 07476c71174a..6be9c1131e1f 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -42,6 +42,7 @@
42#include <asm/uaccess.h> 42#include <asm/uaccess.h>
43#include <linux/vmalloc.h> 43#include <linux/vmalloc.h>
44#include <linux/videodev.h> 44#include <linux/videodev.h>
45#include <media/v4l2-common.h>
45 46
46#include "saa7146.h" 47#include "saa7146.h"
47#include "saa7146reg.h" 48#include "saa7146reg.h"
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index b38bda83a7c5..351b182d921f 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -66,6 +66,7 @@
66#include <linux/pagemap.h> 66#include <linux/pagemap.h>
67#include <linux/errno.h> 67#include <linux/errno.h>
68#include <linux/videodev.h> 68#include <linux/videodev.h>
69#include <media/v4l2-common.h>
69#include <linux/usb.h> 70#include <linux/usb.h>
70#include <linux/mutex.h> 71#include <linux/mutex.h>
71 72
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 103ccb919292..5b6aa49bf4f2 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -26,6 +26,7 @@
26#include <linux/errno.h> 26#include <linux/errno.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/videodev.h> 28#include <linux/videodev.h>
29#include <media/v4l2-common.h>
29#include <linux/i2c.h> 30#include <linux/i2c.h>
30#include <linux/i2c-algo-bit.h> 31#include <linux/i2c-algo-bit.h>
31#include <linux/init.h> 32#include <linux/init.h>
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 74ab48c09c6a..bdf506e6ae27 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -25,6 +25,7 @@
25 25
26#include <linux/i2c.h> 26#include <linux/i2c.h>
27#include <linux/videodev.h> 27#include <linux/videodev.h>
28#include <media/v4l2-common.h>
28 29
29#include <media/tuner.h> 30#include <media/tuner.h>
30 31
diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h
index 3cbf4fc499a3..49dbee5f5628 100644
--- a/drivers/media/video/usbvideo/usbvideo.h
+++ b/drivers/media/video/usbvideo/usbvideo.h
@@ -18,6 +18,7 @@
18 18
19#include <linux/config.h> 19#include <linux/config.h>
20#include <linux/videodev.h> 20#include <linux/videodev.h>
21#include <media/v4l2-common.h>
21#include <linux/usb.h> 22#include <linux/usb.h>
22#include <linux/mutex.h> 23#include <linux/mutex.h>
23 24
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 474a29bc1760..19d3c20dc7ef 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -32,6 +32,7 @@
32#include <linux/errno.h> 32#include <linux/errno.h>
33#include <linux/slab.h> 33#include <linux/slab.h>
34#include <linux/videodev.h> 34#include <linux/videodev.h>
35#include <media/v4l2-common.h>
35 36
36#include <asm/uaccess.h> 37#include <asm/uaccess.h>
37#include <asm/system.h> 38#include <asm/system.h>
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index a8c101494cf5..268e69fdefc6 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -40,7 +40,7 @@
40#include <linux/i2c-algo-sgi.h> 40#include <linux/i2c-algo-sgi.h>
41 41
42#include <linux/videodev.h> 42#include <linux/videodev.h>
43#include <linux/videodev2.h> 43#include <media/v4l2-common.h>
44#include <linux/video_decoder.h> 44#include <linux/video_decoder.h>
45#include <linux/mutex.h> 45#include <linux/mutex.h>
46 46
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 40b205b91481..1eca7e65d235 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -34,6 +34,7 @@
34#define I2C_NAME(x) (x)->name 34#define I2C_NAME(x) (x)->name
35 35
36#include <linux/videodev.h> 36#include <linux/videodev.h>
37#include <media/v4l2-common.h>
37#include <linux/video_decoder.h> 38#include <linux/video_decoder.h>
38 39
39#define I2C_VPX3220 0x86 40#define I2C_VPX3220 0x86
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 80ef8a1b8f63..4bdc886abc4c 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -58,6 +58,7 @@
58#include <linux/init.h> 58#include <linux/init.h>
59#include <linux/delay.h> 59#include <linux/delay.h>
60#include <linux/videodev.h> 60#include <linux/videodev.h>
61#include <media/v4l2-common.h>
61#include <linux/parport.h> 62#include <linux/parport.h>
62 63
63//#define DEBUG // Undef me for production 64//#define DEBUG // Undef me for production
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 798138599bec..958c1e6fc852 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -40,6 +40,7 @@
40#include <linux/i2c.h> 40#include <linux/i2c.h>
41#include <linux/i2c-algo-bit.h> 41#include <linux/i2c-algo-bit.h>
42#include <linux/videodev.h> 42#include <linux/videodev.h>
43#include <media/v4l2-common.h>
43#include <linux/spinlock.h> 44#include <linux/spinlock.h>
44#include <linux/sem.h> 45#include <linux/sem.h>
45#include <linux/kmod.h> 46#include <linux/kmod.h>
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index b5a576a37fd2..fd05a7fc4922 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -73,6 +73,7 @@
73 ) 73 )
74 74
75#include <linux/videodev.h> 75#include <linux/videodev.h>
76#include <media/v4l2-common.h>
76#include "videocodec.h" 77#include "videocodec.h"
77 78
78#include <asm/io.h> 79#include <asm/io.h>
diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c
index a00fae90229a..f4ffe79bdc5b 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran_procfs.c
@@ -43,6 +43,7 @@
43#include <linux/seq_file.h> 43#include <linux/seq_file.h>
44 44
45#include <linux/ctype.h> 45#include <linux/ctype.h>
46#include <linux/poll.h>
46#include <asm/io.h> 47#include <asm/io.h>
47 48
48#include "videocodec.h" 49#include "videocodec.h"
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 5b6205544a7a..41bc7e9603cd 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -12,13 +12,6 @@
12#ifndef __LINUX_VIDEODEV_H 12#ifndef __LINUX_VIDEODEV_H
13#define __LINUX_VIDEODEV_H 13#define __LINUX_VIDEODEV_H
14 14
15#include <linux/types.h>
16#include <linux/poll.h>
17#include <linux/fs.h>
18#include <linux/device.h>
19#include <linux/mutex.h>
20#include <linux/compiler.h> /* need __user */
21
22#define HAVE_V4L1 1 15#define HAVE_V4L1 1
23 16
24#include <linux/videodev2.h> 17#include <linux/videodev2.h>
@@ -343,10 +336,6 @@ struct video_code
343#define VID_HARDWARE_SN9C102 38 336#define VID_HARDWARE_SN9C102 38
344#define VID_HARDWARE_ARV 39 337#define VID_HARDWARE_ARV 39
345 338
346#ifdef __KERNEL__
347#include <media/v4l2-dev.h>
348#endif /* __KERNEL__ */
349
350#endif /* __LINUX_VIDEODEV_H */ 339#endif /* __LINUX_VIDEODEV_H */
351 340
352/* 341/*
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index bb58197ab6b9..795831d9f4d4 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -24,7 +24,6 @@
24 * Common stuff for both V4L1 and V4L2 24 * Common stuff for both V4L1 and V4L2
25 * Moved from videodev.h 25 * Moved from videodev.h
26 */ 26 */
27
28#define VIDEO_MAX_FRAME 32 27#define VIDEO_MAX_FRAME 32
29 28
30#define VID_TYPE_CAPTURE 1 /* Can capture */ 29#define VID_TYPE_CAPTURE 1 /* Can capture */
@@ -200,7 +199,6 @@ struct v4l2_capability
200/* 199/*
201 * V I D E O I M A G E F O R M A T 200 * V I D E O I M A G E F O R M A T
202 */ 201 */
203
204struct v4l2_pix_format 202struct v4l2_pix_format
205{ 203{
206 __u32 width; 204 __u32 width;
@@ -213,7 +211,7 @@ struct v4l2_pix_format
213 __u32 priv; /* private data, depends on pixelformat */ 211 __u32 priv; /* private data, depends on pixelformat */
214}; 212};
215 213
216/* Pixel format FOURCC depth Description */ 214/* Pixel format FOURCC depth Description */
217#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */ 215#define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */
218#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */ 216#define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */
219#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */ 217#define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */
@@ -273,7 +271,6 @@ struct v4l2_fmtdesc
273 271
274#define V4L2_FMT_FLAG_COMPRESSED 0x0001 272#define V4L2_FMT_FLAG_COMPRESSED 0x0001
275 273
276
277/* 274/*
278 * T I M E C O D E 275 * T I M E C O D E
279 */ 276 */
@@ -303,7 +300,6 @@ struct v4l2_timecode
303#define V4L2_TC_USERBITS_8BITCHARS 0x0008 300#define V4L2_TC_USERBITS_8BITCHARS 0x0008
304/* The above is based on SMPTE timecodes */ 301/* The above is based on SMPTE timecodes */
305 302
306
307/* 303/*
308 * M P E G C O M P R E S S I O N P A R A M E T E R S 304 * M P E G C O M P R E S S I O N P A R A M E T E R S
309 * 305 *
@@ -311,8 +307,6 @@ struct v4l2_timecode
311 * ### there will be some incompatible changes. 307 * ### there will be some incompatible changes.
312 * 308 *
313 */ 309 */
314
315
316enum v4l2_bitrate_mode { 310enum v4l2_bitrate_mode {
317 V4L2_BITRATE_NONE = 0, /* not specified */ 311 V4L2_BITRATE_NONE = 0, /* not specified */
318 V4L2_BITRATE_CBR, /* constant bitrate */ 312 V4L2_BITRATE_CBR, /* constant bitrate */
@@ -421,7 +415,6 @@ struct v4l2_jpegcompression
421 * allways use APP0 */ 415 * allways use APP0 */
422}; 416};
423 417
424
425/* 418/*
426 * M E M O R Y - M A P P I N G B U F F E R S 419 * M E M O R Y - M A P P I N G B U F F E R S
427 */ 420 */
@@ -503,7 +496,6 @@ struct v4l2_window
503 void __user *bitmap; 496 void __user *bitmap;
504}; 497};
505 498
506
507/* 499/*
508 * C A P T U R E P A R A M E T E R S 500 * C A P T U R E P A R A M E T E R S
509 */ 501 */
@@ -516,6 +508,7 @@ struct v4l2_captureparm
516 __u32 readbuffers; /* # of buffers for read */ 508 __u32 readbuffers; /* # of buffers for read */
517 __u32 reserved[4]; 509 __u32 reserved[4];
518}; 510};
511
519/* Flags for 'capability' and 'capturemode' fields */ 512/* Flags for 'capability' and 'capturemode' fields */
520#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ 513#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */
521#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ 514#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */
@@ -533,7 +526,6 @@ struct v4l2_outputparm
533/* 526/*
534 * I N P U T I M A G E C R O P P I N G 527 * I N P U T I M A G E C R O P P I N G
535 */ 528 */
536
537struct v4l2_cropcap { 529struct v4l2_cropcap {
538 enum v4l2_buf_type type; 530 enum v4l2_buf_type type;
539 struct v4l2_rect bounds; 531 struct v4l2_rect bounds;
@@ -640,7 +632,6 @@ struct v4l2_standard
640 __u32 reserved[4]; 632 __u32 reserved[4];
641}; 633};
642 634
643
644/* 635/*
645 * V I D E O I N P U T S 636 * V I D E O I N P U T S
646 */ 637 */
@@ -655,6 +646,7 @@ struct v4l2_input
655 __u32 status; 646 __u32 status;
656 __u32 reserved[4]; 647 __u32 reserved[4];
657}; 648};
649
658/* Values for the 'type' field */ 650/* Values for the 'type' field */
659#define V4L2_INPUT_TYPE_TUNER 1 651#define V4L2_INPUT_TYPE_TUNER 1
660#define V4L2_INPUT_TYPE_CAMERA 2 652#define V4L2_INPUT_TYPE_CAMERA 2
@@ -834,6 +826,7 @@ struct v4l2_audio
834 __u32 mode; 826 __u32 mode;
835 __u32 reserved[2]; 827 __u32 reserved[2];
836}; 828};
829
837/* Flags for the 'capability' field */ 830/* Flags for the 'capability' field */
838#define V4L2_AUDCAP_STEREO 0x00001 831#define V4L2_AUDCAP_STEREO 0x00001
839#define V4L2_AUDCAP_AVL 0x00002 832#define V4L2_AUDCAP_AVL 0x00002
@@ -857,7 +850,6 @@ struct v4l2_audioout
857 */ 850 */
858 851
859/* Raw VBI */ 852/* Raw VBI */
860
861struct v4l2_vbi_format 853struct v4l2_vbi_format
862{ 854{
863 __u32 sampling_rate; /* in 1 Hz */ 855 __u32 sampling_rate; /* in 1 Hz */
@@ -964,8 +956,6 @@ struct v4l2_streamparm
964 } parm; 956 } parm;
965}; 957};
966 958
967
968
969/* 959/*
970 * I O C T L C O D E S F O R V I D E O D E V I C E S 960 * I O C T L C O D E S F O R V I D E O D E V I C E S
971 * 961 *
diff --git a/include/media/ovcamchip.h b/include/media/ovcamchip.h
index 8138983adced..0f43451f8bb3 100644
--- a/include/media/ovcamchip.h
+++ b/include/media/ovcamchip.h
@@ -15,6 +15,7 @@
15#define __LINUX_OVCAMCHIP_H 15#define __LINUX_OVCAMCHIP_H
16 16
17#include <linux/videodev.h> 17#include <linux/videodev.h>
18#include <media/v4l2-common.h>
18#include <linux/i2c.h> 19#include <linux/i2c.h>
19 20
20/* --------------------------------- */ 21/* --------------------------------- */
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 4507cb61ae93..83fe2e3d1e25 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -2,7 +2,7 @@
2#define __SAA7146_VV__ 2#define __SAA7146_VV__
3 3
4#include <linux/videodev.h> 4#include <linux/videodev.h>
5 5#include <media/v4l2-common.h>
6#include <media/saa7146.h> 6#include <media/saa7146.h>
7#include <media/video-buf.h> 7#include <media/video-buf.h>
8 8
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index c2f54d2c9a4c..dec6b24e4c42 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -40,8 +40,6 @@
40#define VFL_TYPE_RADIO 2 40#define VFL_TYPE_RADIO 2
41#define VFL_TYPE_VTX 3 41#define VFL_TYPE_VTX 3
42 42
43 const struct file_operations *fops;
44
45/* Video standard functions */ 43/* Video standard functions */
46extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); 44extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
47extern int v4l2_video_std_construct(struct v4l2_standard *vs, 45extern int v4l2_video_std_construct(struct v4l2_standard *vs,
@@ -92,7 +90,7 @@ struct v4l2_tvnorm {
92struct video_device 90struct video_device
93{ 91{
94 /* device ops */ 92 /* device ops */
95 struct file_operations *fops; 93 const struct file_operations *fops;
96 94
97 /* device info */ 95 /* device info */
98 struct device *dev; 96 struct device *dev;
@@ -297,7 +295,7 @@ struct video_device
297 int (*vidioc_log_status) (struct file *file, void *fh); 295 int (*vidioc_log_status) (struct file *file, void *fh);
298 296
299 297
300#if OBSOLETE_OWNER /* to be removed soon */ 298#ifdef OBSOLETE_OWNER /* to be removed soon */
301/* obsolete -- fops->owner is used instead */ 299/* obsolete -- fops->owner is used instead */
302struct module *owner; 300struct module *owner;
303/* dev->driver_data will be used instead some day. 301/* dev->driver_data will be used instead some day.
@@ -351,7 +349,7 @@ video_device_remove_file(struct video_device *vfd,
351 class_device_remove_file(&vfd->class_dev, attr); 349 class_device_remove_file(&vfd->class_dev, attr);
352} 350}
353 351
354#if OBSOLETE_OWNER /* to be removed soon */ 352#ifdef OBSOLETE_OWNER /* to be removed soon */
355/* helper functions to access driver private data. */ 353/* helper functions to access driver private data. */
356static inline void *video_get_drvdata(struct video_device *dev) 354static inline void *video_get_drvdata(struct video_device *dev)
357{ 355{