aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov2640.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-09-09 12:56:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:29:04 -0400
commit95d20109ad6478ecea5e93ba191270fb645d52c7 (patch)
treeeba4717e3885a165f27c9aa2a3242202daeae58a /drivers/media/video/ov2640.c
parent2f0babb7e43278247df512263581c4738afa4cbc (diff)
[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>
Diffstat (limited to 'drivers/media/video/ov2640.c')
-rw-r--r--drivers/media/video/ov2640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ov2640.c b/drivers/media/video/ov2640.c
index d37a5cceebb6..b5247cb64fde 100644
--- a/drivers/media/video/ov2640.c
+++ b/drivers/media/video/ov2640.c
@@ -18,10 +18,10 @@
18#include <linux/i2c.h> 18#include <linux/i2c.h>
19#include <linux/slab.h> 19#include <linux/slab.h>
20#include <linux/delay.h> 20#include <linux/delay.h>
21#include <linux/v4l2-mediabus.h>
21#include <linux/videodev2.h> 22#include <linux/videodev2.h>
22 23
23#include <media/soc_camera.h> 24#include <media/soc_camera.h>
24#include <media/soc_mediabus.h>
25#include <media/v4l2-chip-ident.h> 25#include <media/v4l2-chip-ident.h>
26#include <media/v4l2-subdev.h> 26#include <media/v4l2-subdev.h>
27#include <media/v4l2-ctrls.h> 27#include <media/v4l2-ctrls.h>