Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / media / video / cx18 / cx18-cards.c

diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index f808fb6..74e122b 100644 (file)
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -370,6 +370,7 @@ static const struct cx18_card cx18_card_leadtek_pvr2100 = {
                { CX18_CARD_INPUT_SVIDEO1,    1,
                        CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },
+               { CX18_CARD_INPUT_COMPONENT1, 1, CX18_AV_COMPONENT1 },
        },
        .audio_inputs = {
                { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
@@ -422,6 +423,7 @@ static const struct cx18_card cx18_card_leadtek_dvr3100h = {
                { CX18_CARD_INPUT_SVIDEO1,    1,
                        CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },
                { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },
+               { CX18_CARD_INPUT_COMPONENT1, 1, CX18_AV_COMPONENT1 },
        },
        .audio_inputs = {
                { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5,        0 },
@@ -480,7 +482,7 @@ int cx18_get_input(struct cx18 *cx, u16 index, struct v4l2_input *input)
                "S-Video 2",
                "Composite 1",
                "Composite 2",
-               "Composite 3"
+               "Component 1"
        };
 
        memset(input, 0, sizeof(*input));