From c4acaed5b9136a7803f71359700464eacb47ef45 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 29 Mar 2013 10:14:32 -0300 Subject: [PATCH] --- yaml --- r: 366909 b: refs/heads/master c: 2cb5972da8ee95c58db3375c288563f3b75bc61c h: refs/heads/master i: 366907: df3ac8ef4f7ec983357255c6f0bebd8bbad28bda v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/v4l2-controls.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f6db290e0527..91dafe9c70a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79a63c60a6a2ae589e44529401e0ab1150e9408a +refs/heads/master: 2cb5972da8ee95c58db3375c288563f3b75bc61c diff --git a/trunk/include/uapi/linux/v4l2-controls.h b/trunk/include/uapi/linux/v4l2-controls.h index 910d7cd3d9f4..7da22cec30cd 100644 --- a/trunk/include/uapi/linux/v4l2-controls.h +++ b/trunk/include/uapi/linux/v4l2-controls.h @@ -153,12 +153,12 @@ enum v4l2_colorfx { /* The base for the s2255 driver controls. - * We reserve 8 controls for this driver. */ -#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1010) + * We reserve 16 controls for this driver. */ +#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030) /* The base for the si476x driver controls. See include/media/si476x.h for the list - * of controls. Total of 16 controls is reserved for that driver */ -#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1010) + * of controls. Total of 16 controls is reserved for this driver */ +#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040) /* MPEG-class control IDs */