summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-12-14 08:28:24 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-30 12:01:21 -0300
commit981ad84d885007bf5343c0100e6c7dd1ff2ac17a (patch)
tree30bbc848c203e009513ced416402845b577b20f7 /include
parentf1a225ec2655d05f92b9424580a19dd53551064f (diff)
downloadlinux-3.10-981ad84d885007bf5343c0100e6c7dd1ff2ac17a.tar.gz
linux-3.10-981ad84d885007bf5343c0100e6c7dd1ff2ac17a.tar.bz2
linux-3.10-981ad84d885007bf5343c0100e6c7dd1ff2ac17a.zip
upstream: [media] saa7134: convert to the control framework
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/v4l2-controls.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index c34561b1af5..fd33498fa87 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -165,6 +165,10 @@ enum v4l2_colorfx {
* this driver */
#define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_USER_BASE + 0x1050)
+/* The base for the saa7134 driver controls.
+ * We reserve 16 controls for this driver. */
+#define V4L2_CID_USER_SAA7134_BASE (V4L2_CID_USER_BASE + 0x1060)
+
/* MPEG-class control IDs */
/* The MPEG controls are applicable to all codec controls
* and the 'MPEG' part of the define is historical */