From d49f4e7661e9663bd3694663b400893a3cfab2e4 Mon Sep 17 00:00:00 2001
From: Frej Drejhammar <frej.drejhammar@gmail.com>
Date: Sun, 23 Mar 2008 22:43:24 -0300
Subject: [PATCH] --- yaml --- r: 92567 b: refs/heads/master c:
 1b879c43811933514130421548fff7640e84d8e5 h: refs/heads/master i:   92565:
 2cbec10dbb2ad1ff30dda3a44e79c6112d5231fb   92563:
 3e6329fd6f1c9eb866b9ccf6dea462464a0b6828   92559:
 008766a6e5c531b64dbb45069d1927f57a0e70cd v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/video/cx88/cx88-video.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 92e8cb71f468..241c83c4313e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8ac688938b89ab0fa8ffe16da0facdc73a70588
+refs/heads/master: 1b879c43811933514130421548fff7640e84d8e5
diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c
index f9bcb9dc8582..548ec492c6b6 100644
--- a/trunk/drivers/media/video/cx88/cx88-video.c
+++ b/trunk/drivers/media/video/cx88/cx88-video.c
@@ -239,6 +239,18 @@ static struct cx88_ctrl cx8800_ctls[] = {
 		.reg                   = MO_INPUT_FORMAT,
 		.mask                  = 1 << 10,
 		.shift                 = 10,
+	}, {
+		.v = {
+			.id            = V4L2_CID_COLOR_KILLER,
+			.name          = "Color killer",
+			.minimum       = 0,
+			.maximum       = 1,
+			.default_value = 0x0,
+			.type          = V4L2_CTRL_TYPE_BOOLEAN,
+		},
+		.reg                   = MO_INPUT_FORMAT,
+		.mask                  = 1 << 9,
+		.shift                 = 9,
 	}, {
 	/* --- audio --- */
 		.v = {
@@ -295,6 +307,7 @@ const u32 cx88_user_ctrls[] = {
 	V4L2_CID_AUDIO_BALANCE,
 	V4L2_CID_AUDIO_MUTE,
 	V4L2_CID_CHROMA_AGC,
+	V4L2_CID_COLOR_KILLER,
 	0
 };
 EXPORT_SYMBOL(cx88_user_ctrls);