Merge branches 'pxa' and 'orion-fixes1'

[linux-2.6] / drivers / media / video / cx88 / cx88-video.c

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index f9bcb9dc8582d789ea13a65e7c4c7902c27ac5af..eea23f95edb751d42f9dce1588f817038e0ba5bf 100644 (file)
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/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 = 0x1,
+                       .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);