From 56b2fc3d47330e4ac4e0b74ccff01e51d98c9ecd Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 22 Jul 2007 12:13:08 -0300 Subject: [PATCH] --- yaml --- r: 65677 b: refs/heads/master c: fa8a7529ba8c3c2f87dec78ad32c388695f4c1b7 h: refs/heads/master i: 65675: a2f1984a9fa298546193cfa336a859c2447a90cf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-cards.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e99d14570fe4..4a6e1fa65ab0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bb293849489b6cc5d6919b8c7f94cb273303e1f +refs/heads/master: fa8a7529ba8c3c2f87dec78ad32c388695f4c1b7 diff --git a/trunk/drivers/media/video/ivtv/ivtv-cards.c b/trunk/drivers/media/video/ivtv/ivtv-cards.c index 8eab02083887..baab14b40e87 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-cards.c +++ b/trunk/drivers/media/video/ivtv/ivtv-cards.c @@ -845,6 +845,7 @@ static const struct ivtv_card ivtv_card_pg600v2 = { { IVTV_CARD_INPUT_VID_TUNER, 0, CX25840_COMPOSITE2 }, { IVTV_CARD_INPUT_SVIDEO1, 1, CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4 }, + { IVTV_CARD_INPUT_COMPOSITE1, 1, CX25840_COMPOSITE1 }, }, .audio_inputs = { { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO5 },