---

yaml --- r: 92567 b: refs/heads/master c: 1b879c4 h: refs/heads/master i: 92565: 2cbec10 92563: 3e6329f 92559: 008766a v: v3
git-mirror · Apr 24, 2008 · d49f4e7 · d49f4e7
1 parent 24568cd
commit d49f4e7
Show file tree

Hide file tree

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