aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-05-23 04:07:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:55:38 -0300
commitfa4d7096d1fb7c012ebaacefee132007a21e0965 (patch)
treeb33643476d3df4c675b7edaada6a0f35d3837272 /include
parent[media] vivi: Fix sleep-in-atomic-context (diff)
downloadlinux-dev-fa4d7096d1fb7c012ebaacefee132007a21e0965.tar.xz
linux-dev-fa4d7096d1fb7c012ebaacefee132007a21e0965.zip
[media] v4l2-ctrls: add new bitmask control type
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/videodev2.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index f002006fc0a9..148d1a51ca22 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1040,6 +1040,7 @@ enum v4l2_ctrl_type {
V4L2_CTRL_TYPE_INTEGER64 = 5,
V4L2_CTRL_TYPE_CTRL_CLASS = 6,
V4L2_CTRL_TYPE_STRING = 7,
+ V4L2_CTRL_TYPE_BITMASK = 8,
};
/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */