From ca442cc46f7fa49bcec40b342538c432a662f771 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@skynet.be>
Date: Sun, 14 Dec 2008 16:22:05 -0300
Subject: [PATCH] --- yaml --- r: 124407 b: refs/heads/master c:
 046425f8c4ac431db00c09a6d9fba16560b8e5b9 h: refs/heads/master i:   124405:
 9a1b6777dd0875db34db345de88523cd2a64bc2a   124403:
 0eb8c23afa12eabcceddf06d48d37ab9b34dc1b4   124399:
 6ee56ecd4df24770a7efb262b42da03ca20062e8 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/videodev2.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b3ae2cee5f0e..4b845bcb821a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0877258d98154565def498833ccb208234c85084
+refs/heads/master: 046425f8c4ac431db00c09a6d9fba16560b8e5b9
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index e450a92a622b..6e6743bd0f92 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -1122,6 +1122,8 @@ enum  v4l2_exposure_auto_type {
 #define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
 #define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
 
+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
+
 /*
  *	T U N I N G
  */