Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 95d20109ad6478ecea5e93ba191270fb645d52c7

Authored by Guennadi Liakhovetski
Committed by Mauro Carvalho Chehab
1 parent 2f0babb7e4
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[media] V4L: replace soc-camera specific soc_mediabus.h with v4l2-mediabus.h 

Most users of the <media/soc_mediabus.h> header only need pixel code
definitions, which are now located in the generic <linux/v4l2-mediabus.h>
header. Switch over to reduce soc-camera dependencies.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 12 changed files with 12 additions and 12 deletions Side-by-side Diff

drivers/media/video/imx074.c
Diff comments   View file @ 95d2010
... ... @@ -12,11 +12,11 @@
12 12  
13 13 #include <linux/delay.h>
14 14 #include <linux/i2c.h>
  15 +#include <linux/v4l2-mediabus.h>
15 16 #include <linux/slab.h>
16 17 #include <linux/videodev2.h>
17 18  
18 19 #include <media/soc_camera.h>
19   -#include <media/soc_mediabus.h>
20 20 #include <media/v4l2-subdev.h>
21 21 #include <media/v4l2-chip-ident.h>
22 22  
drivers/media/video/mt9m111.c
Diff comments   View file @ 95d2010
... ... @@ -13,9 +13,9 @@
13 13 #include <linux/log2.h>
14 14 #include <linux/gpio.h>
15 15 #include <linux/delay.h>
  16 +#include <linux/v4l2-mediabus.h>
16 17  
17 18 #include <media/soc_camera.h>
18   -#include <media/soc_mediabus.h>
19 19 #include <media/v4l2-common.h>
20 20 #include <media/v4l2-ctrls.h>
21 21 #include <media/v4l2-chip-ident.h>
drivers/media/video/mt9t031.c
Diff comments   View file @ 95d2010
... ... @@ -13,10 +13,10 @@
13 13 #include <linux/log2.h>
14 14 #include <linux/pm.h>
15 15 #include <linux/slab.h>
  16 +#include <linux/v4l2-mediabus.h>
16 17 #include <linux/videodev2.h>
17 18  
18 19 #include <media/soc_camera.h>
19   -#include <media/soc_mediabus.h>
20 20 #include <media/v4l2-chip-ident.h>
21 21 #include <media/v4l2-subdev.h>
22 22 #include <media/v4l2-ctrls.h>
drivers/media/video/mt9t112.c
Diff comments   View file @ 95d2010
... ... @@ -22,11 +22,11 @@
22 22 #include <linux/init.h>
23 23 #include <linux/module.h>
24 24 #include <linux/slab.h>
  25 +#include <linux/v4l2-mediabus.h>
25 26 #include <linux/videodev2.h>
26 27  
27 28 #include <media/mt9t112.h>
28 29 #include <media/soc_camera.h>
29   -#include <media/soc_mediabus.h>
30 30 #include <media/v4l2-chip-ident.h>
31 31 #include <media/v4l2-common.h>
32 32  
drivers/media/video/ov2640.c
Diff comments   View file @ 95d2010
... ... @@ -18,10 +18,10 @@
18 18 #include <linux/i2c.h>
19 19 #include <linux/slab.h>
20 20 #include <linux/delay.h>
  21 +#include <linux/v4l2-mediabus.h>
21 22 #include <linux/videodev2.h>
22 23  
23 24 #include <media/soc_camera.h>
24   -#include <media/soc_mediabus.h>
25 25 #include <media/v4l2-chip-ident.h>
26 26 #include <media/v4l2-subdev.h>
27 27 #include <media/v4l2-ctrls.h>
drivers/media/video/ov5642.c
Diff comments   View file @ 95d2010
... ... @@ -19,9 +19,9 @@
19 19 #include <linux/slab.h>
20 20 #include <linux/videodev2.h>
21 21 #include <linux/module.h>
  22 +#include <linux/v4l2-mediabus.h>
22 23  
23 24 #include <media/soc_camera.h>
24   -#include <media/soc_mediabus.h>
25 25 #include <media/v4l2-chip-ident.h>
26 26 #include <media/v4l2-subdev.h>
27 27  
drivers/media/video/ov6650.c
Diff comments   View file @ 95d2010
... ... @@ -28,9 +28,9 @@
28 28 #include <linux/delay.h>
29 29 #include <linux/i2c.h>
30 30 #include <linux/slab.h>
  31 +#include <linux/v4l2-mediabus.h>
31 32  
32 33 #include <media/soc_camera.h>
33   -#include <media/soc_mediabus.h>
34 34 #include <media/v4l2-chip-ident.h>
35 35 #include <media/v4l2-ctrls.h>
36 36  
drivers/media/video/ov772x.c
Diff comments   View file @ 95d2010
... ... @@ -20,11 +20,11 @@
20 20 #include <linux/i2c.h>
21 21 #include <linux/slab.h>
22 22 #include <linux/delay.h>
  23 +#include <linux/v4l2-mediabus.h>
23 24 #include <linux/videodev2.h>
24 25  
25 26 #include <media/ov772x.h>
26 27 #include <media/soc_camera.h>
27   -#include <media/soc_mediabus.h>
28 28 #include <media/v4l2-ctrls.h>
29 29 #include <media/v4l2-chip-ident.h>
30 30 #include <media/v4l2-subdev.h>
drivers/media/video/ov9640.c
Diff comments   View file @ 95d2010
... ... @@ -24,10 +24,10 @@
24 24 #include <linux/i2c.h>
25 25 #include <linux/slab.h>
26 26 #include <linux/delay.h>
  27 +#include <linux/v4l2-mediabus.h>
27 28 #include <linux/videodev2.h>
28 29  
29 30 #include <media/soc_camera.h>
30   -#include <media/soc_mediabus.h>
31 31 #include <media/v4l2-chip-ident.h>
32 32 #include <media/v4l2-common.h>
33 33 #include <media/v4l2-ctrls.h>
drivers/media/video/ov9740.c
Diff comments   View file @ 95d2010
... ... @@ -14,9 +14,9 @@
14 14 #include <linux/module.h>
15 15 #include <linux/i2c.h>
16 16 #include <linux/slab.h>
  17 +#include <linux/v4l2-mediabus.h>
17 18  
18 19 #include <media/soc_camera.h>
19   -#include <media/soc_mediabus.h>
20 20 #include <media/v4l2-chip-ident.h>
21 21 #include <media/v4l2-ctrls.h>
22 22  
drivers/media/video/rj54n1cb0c.c
Diff comments   View file @ 95d2010
... ... @@ -11,11 +11,11 @@
11 11 #include <linux/delay.h>
12 12 #include <linux/i2c.h>
13 13 #include <linux/slab.h>
  14 +#include <linux/v4l2-mediabus.h>
14 15 #include <linux/videodev2.h>
15 16  
16 17 #include <media/rj54n1cb0c.h>
17 18 #include <media/soc_camera.h>
18   -#include <media/soc_mediabus.h>
19 19 #include <media/v4l2-subdev.h>
20 20 #include <media/v4l2-chip-ident.h>
21 21 #include <media/v4l2-ctrls.h>
drivers/media/video/tw9910.c
Diff comments   View file @ 95d2010
... ... @@ -22,10 +22,10 @@
22 22 #include <linux/slab.h>
23 23 #include <linux/kernel.h>
24 24 #include <linux/delay.h>
  25 +#include <linux/v4l2-mediabus.h>
25 26 #include <linux/videodev2.h>
26 27  
27 28 #include <media/soc_camera.h>
28   -#include <media/soc_mediabus.h>
29 29 #include <media/tw9910.h>
30 30 #include <media/v4l2-chip-ident.h>
31 31 #include <media/v4l2-subdev.h>