From 22946a6d49e0af95c51dc7b5fc0c93cbfcc14ed3 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 26 Mar 2013 22:47:25 -0300 Subject: [PATCH] --- yaml --- r: 366905 b: refs/heads/master c: 33a80fc2eb43afbc25f04cc1d5ed899da213c21f h: refs/heads/master i: 366903: 87a48ded637b5470b2f82509b82caea2a3cbe81b v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/v4l2-controls.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fe5c447b426b..19d2b4eaafef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4e96a7e9f9511d1b57a10a08cd10af6e517966b +refs/heads/master: 33a80fc2eb43afbc25f04cc1d5ed899da213c21f diff --git a/trunk/include/uapi/linux/v4l2-controls.h b/trunk/include/uapi/linux/v4l2-controls.h index 7d2604877a73..910d7cd3d9f4 100644 --- a/trunk/include/uapi/linux/v4l2-controls.h +++ b/trunk/include/uapi/linux/v4l2-controls.h @@ -156,6 +156,10 @@ enum v4l2_colorfx { * We reserve 8 controls for this driver. */ #define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1010) +/* 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) + /* MPEG-class control IDs */ #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)