summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/marvell-ccic/mcam-core.h
diff options
context:
space:
mode:
authorJavier Martin2013-01-29 11:58:48 +0100
committerMauro Carvalho Chehab2013-02-08 17:42:16 +0100
commit593403c59b2c1977cf22313d4bb7e912b35ee797 (patch)
treec102277504ee042e19989b07ea8e53816aaad5cf /drivers/media/platform/marvell-ccic/mcam-core.h
parent[media] ov7670: use the control framework (diff)
downloadkernel-qcow2-linux-593403c59b2c1977cf22313d4bb7e912b35ee797.tar.gz
kernel-qcow2-linux-593403c59b2c1977cf22313d4bb7e912b35ee797.tar.xz
kernel-qcow2-linux-593403c59b2c1977cf22313d4bb7e912b35ee797.zip
[media] mcam-core: implement the control framework
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic/mcam-core.h')
-rw-r--r--drivers/media/platform/marvell-ccic/mcam-core.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index 6c53ac9681da..01dec9e5fc2b 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -8,6 +8,7 @@
#include <linux/list.h>
#include <media/v4l2-common.h>
+#include <media/v4l2-ctrls.h>
#include <media/v4l2-dev.h>
#include <media/videobuf2-core.h>
@@ -112,6 +113,7 @@ struct mcam_camera {
* should not be touched by the platform code.
*/
struct v4l2_device v4l2_dev;
+ struct v4l2_ctrl_handler ctrl_handler;
enum mcam_state state;
unsigned long flags; /* Buffer status, mainly (dev_lock) */
int users; /* How many open FDs */