Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95d20109 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2f0babb7

drivers/media/video/imx074.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,11 +12,11 @@ 




#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/v4l2-mediabus.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/videodev2.h>

#include <linux/videodev2.h>





#include <media/soc_camera.h>

#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-chip-ident.h>

drivers/media/video/mt9m111.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,9 +13,9 @@ 
#include <linux/log2.h>

#include <linux/log2.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/v4l2-mediabus.h>





#include <media/soc_camera.h>

#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-common.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-chip-ident.h>

drivers/media/video/mt9t031.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,10 +13,10 @@ 
#include <linux/log2.h>

#include <linux/log2.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/v4l2-mediabus.h>

#include <linux/videodev2.h>

#include <linux/videodev2.h>





#include <media/soc_camera.h>

#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-ctrls.h>

drivers/media/video/mt9t112.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,11 +22,11 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/v4l2-mediabus.h>

#include <linux/videodev2.h>

#include <linux/videodev2.h>





#include <media/mt9t112.h>

#include <media/mt9t112.h>

#include <media/soc_camera.h>

#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-common.h>

#include <media/v4l2-common.h>

drivers/media/video/ov2640.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/v4l2-mediabus.h>

#include <linux/videodev2.h>

#include <linux/videodev2.h>





#include <media/soc_camera.h>

#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-subdev.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-ctrls.h>