---

yaml --- r: 366905 b: refs/heads/master c: 33a80fc h: refs/heads/master i: 366903: 87a48de v: v3
git-mirror · Mar 29, 2013 · 22946a6 · 22946a6
1 parent 5138b87
commit 22946a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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)