---

yaml --- r: 65677 b: refs/heads/master c: fa8a752 h: refs/heads/master i: 65675: a2f1984 v: v3
git-mirror · Oct 10, 2007 · 56b2fc3 · 56b2fc3
1 parent b3d2723
commit 56b2fc3
Show file tree

Hide file tree

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