diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/cs53l32a.c | 2 | ||||
-rw-r--r-- | drivers/media/video/m52790.c | 2 | ||||
-rw-r--r-- | drivers/media/video/msp3400-driver.c | 1 | ||||
-rw-r--r-- | drivers/media/video/msp3400-kthreads.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa717x.c | 1 | ||||
-rw-r--r-- | drivers/media/video/tda7432.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tda9875.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tlv320aic23b.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tveeprom.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tvp5150.c | 2 | ||||
-rw-r--r-- | drivers/media/video/v4l2-common.c | 2 | ||||
-rw-r--r-- | drivers/media/video/vino.c | 2 | ||||
-rw-r--r-- | drivers/media/video/vp27smpx.c | 2 | ||||
-rw-r--r-- | drivers/media/video/vpx3220.c | 2 | ||||
-rw-r--r-- | drivers/media/video/w9966.c | 2 | ||||
-rw-r--r-- | drivers/media/video/w9968cf.h | 2 | ||||
-rw-r--r-- | drivers/media/video/wm8739.c | 2 | ||||
-rw-r--r-- | drivers/media/video/wm8775.c | 2 |
18 files changed, 15 insertions, 18 deletions
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c index 645b339152d3..e30a589c0e18 100644 --- a/drivers/media/video/cs53l32a.c +++ b/drivers/media/video/cs53l32a.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/i2c-id.h> | 28 | #include <linux/i2c-id.h> |
29 | #include <linux/videodev.h> | 29 | #include <linux/videodev2.h> |
30 | #include <media/v4l2-common.h> | 30 | #include <media/v4l2-common.h> |
31 | #include <media/v4l2-chip-ident.h> | 31 | #include <media/v4l2-chip-ident.h> |
32 | #include <media/v4l2-i2c-drv-legacy.h> | 32 | #include <media/v4l2-i2c-drv-legacy.h> |
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c index 39bf6b114d50..89a781c6929d 100644 --- a/drivers/media/video/m52790.c +++ b/drivers/media/video/m52790.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/i2c-id.h> | 28 | #include <linux/i2c-id.h> |
29 | #include <linux/videodev.h> | 29 | #include <linux/videodev2.h> |
30 | #include <media/m52790.h> | 30 | #include <media/m52790.h> |
31 | #include <media/v4l2-common.h> | 31 | #include <media/v4l2-common.h> |
32 | #include <media/v4l2-chip-ident.h> | 32 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 780531b587a4..3da74dcee902 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c | |||
@@ -51,7 +51,6 @@ | |||
51 | #include <linux/module.h> | 51 | #include <linux/module.h> |
52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
53 | #include <linux/i2c.h> | 53 | #include <linux/i2c.h> |
54 | #include <linux/videodev.h> | ||
55 | #include <linux/videodev2.h> | 54 | #include <linux/videodev2.h> |
56 | #include <media/v4l2-common.h> | 55 | #include <media/v4l2-common.h> |
57 | #include <media/v4l2-ioctl.h> | 56 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c index 1622f70e4dd0..846a14a61fd1 100644 --- a/drivers/media/video/msp3400-kthreads.c +++ b/drivers/media/video/msp3400-kthreads.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include <linux/freezer.h> | 27 | #include <linux/freezer.h> |
28 | #include <linux/videodev.h> | ||
29 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
30 | #include <media/v4l2-common.h> | 29 | #include <media/v4l2-common.h> |
31 | #include <media/msp3400.h> | 30 | #include <media/msp3400.h> |
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 2220f9569941..af60ede5310d 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
37 | 37 | ||
38 | #include <linux/videodev.h> | ||
39 | #include <linux/videodev2.h> | 38 | #include <linux/videodev2.h> |
40 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
41 | #include <media/v4l2-common.h> | 40 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c index 2fda40c0f255..4963d4264880 100644 --- a/drivers/media/video/tda7432.c +++ b/drivers/media/video/tda7432.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
45 | #include <linux/errno.h> | 45 | #include <linux/errno.h> |
46 | #include <linux/slab.h> | 46 | #include <linux/slab.h> |
47 | #include <linux/videodev.h> | 47 | #include <linux/videodev2.h> |
48 | #include <linux/i2c.h> | 48 | #include <linux/i2c.h> |
49 | 49 | ||
50 | #include <media/v4l2-common.h> | 50 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index 7a8ce8fb46dc..792f0b079909 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
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/videodev2.h> |
29 | #include <media/v4l2-common.h> | 29 | #include <media/v4l2-common.h> |
30 | #include <linux/i2c.h> | 30 | #include <linux/i2c.h> |
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c index 9220378a5637..281065b9dd2d 100644 --- a/drivers/media/video/tlv320aic23b.c +++ b/drivers/media/video/tlv320aic23b.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
30 | #include <linux/i2c.h> | 30 | #include <linux/i2c.h> |
31 | #include <linux/i2c-id.h> | 31 | #include <linux/i2c-id.h> |
32 | #include <linux/videodev.h> | 32 | #include <linux/videodev2.h> |
33 | #include <media/v4l2-common.h> | 33 | #include <media/v4l2-common.h> |
34 | #include <media/v4l2-i2c-drv-legacy.h> | 34 | #include <media/v4l2-i2c-drv-legacy.h> |
35 | 35 | ||
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index fbfac1b3bd02..bcc32fa92a81 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
37 | #include <linux/videodev.h> | 37 | #include <linux/videodev2.h> |
38 | #include <linux/i2c.h> | 38 | #include <linux/i2c.h> |
39 | 39 | ||
40 | #include <media/tuner.h> | 40 | #include <media/tuner.h> |
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 6a3af1005f03..28af5ce5560d 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
9 | #include <linux/videodev.h> | 9 | #include <linux/videodev2.h> |
10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
11 | #include <linux/video_decoder.h> | 11 | #include <linux/video_decoder.h> |
12 | #include <media/v4l2-common.h> | 12 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index e9dd996fd5df..88ca13104417 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -64,7 +64,7 @@ | |||
64 | #include <linux/kmod.h> | 64 | #include <linux/kmod.h> |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #include <linux/videodev.h> | 67 | #include <linux/videodev2.h> |
68 | 68 | ||
69 | MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr"); | 69 | MODULE_AUTHOR("Bill Dirks, Justin Schoeman, Gerd Knorr"); |
70 | MODULE_DESCRIPTION("misc helper functions for v4l2 device drivers"); | 70 | MODULE_DESCRIPTION("misc helper functions for v4l2 device drivers"); |
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 01ea99c9bc1a..f0fcb008b723 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <linux/i2c.h> | 38 | #include <linux/i2c.h> |
39 | #include <linux/i2c-algo-sgi.h> | 39 | #include <linux/i2c-algo-sgi.h> |
40 | 40 | ||
41 | #include <linux/videodev.h> | 41 | #include <linux/videodev2.h> |
42 | #include <media/v4l2-common.h> | 42 | #include <media/v4l2-common.h> |
43 | #include <linux/video_decoder.h> | 43 | #include <linux/video_decoder.h> |
44 | #include <linux/mutex.h> | 44 | #include <linux/mutex.h> |
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c index cbecb3cbbbaa..577956c5410b 100644 --- a/drivers/media/video/vp27smpx.c +++ b/drivers/media/video/vp27smpx.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/i2c-id.h> | 29 | #include <linux/i2c-id.h> |
30 | #include <linux/videodev.h> | 30 | #include <linux/videodev2.h> |
31 | #include <media/v4l2-common.h> | 31 | #include <media/v4l2-common.h> |
32 | #include <media/v4l2-chip-ident.h> | 32 | #include <media/v4l2-chip-ident.h> |
33 | #include <media/v4l2-i2c-drv.h> | 33 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index 35293029da02..3b83d4e2b2c3 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #define I2C_NAME(x) (x)->name | 34 | #define I2C_NAME(x) (x)->name |
35 | 35 | ||
36 | #include <linux/videodev.h> | 36 | #include <linux/videodev2.h> |
37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
38 | #include <linux/video_decoder.h> | 38 | #include <linux/video_decoder.h> |
39 | 39 | ||
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 1641998c73e6..925b4e7b557d 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
@@ -57,7 +57,7 @@ | |||
57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
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/videodev2.h> |
61 | #include <media/v4l2-common.h> | 61 | #include <media/v4l2-common.h> |
62 | #include <media/v4l2-ioctl.h> | 62 | #include <media/v4l2-ioctl.h> |
63 | #include <linux/parport.h> | 63 | #include <linux/parport.h> |
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h index 3c95316bc030..30032e15e23c 100644 --- a/drivers/media/video/w9968cf.h +++ b/drivers/media/video/w9968cf.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef _W9968CF_H_ | 21 | #ifndef _W9968CF_H_ |
22 | #define _W9968CF_H_ | 22 | #define _W9968CF_H_ |
23 | 23 | ||
24 | #include <linux/videodev.h> | 24 | #include <linux/videodev2.h> |
25 | #include <linux/usb.h> | 25 | #include <linux/usb.h> |
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c index 7be47a255853..95c79ad80487 100644 --- a/drivers/media/video/wm8739.c +++ b/drivers/media/video/wm8739.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/i2c-id.h> | 29 | #include <linux/i2c-id.h> |
30 | #include <linux/videodev.h> | 30 | #include <linux/videodev2.h> |
31 | #include <media/v4l2-common.h> | 31 | #include <media/v4l2-common.h> |
32 | #include <media/v4l2-chip-ident.h> | 32 | #include <media/v4l2-chip-ident.h> |
33 | #include <media/v4l2-i2c-drv.h> | 33 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c index c2ab70a04a74..48df661d4fc3 100644 --- a/drivers/media/video/wm8775.c +++ b/drivers/media/video/wm8775.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
33 | #include <linux/i2c-id.h> | 33 | #include <linux/i2c-id.h> |
34 | #include <linux/videodev.h> | 34 | #include <linux/videodev2.h> |
35 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
36 | #include <media/v4l2-chip-ident.h> | 36 | #include <media/v4l2-chip-ident.h> |
37 | #include <media/v4l2-i2c-drv-legacy.h> | 37 | #include <media/v4l2-i2c-drv-legacy.h> |