From: Heiko Baums <heiko@baums-on-web.de>
Date: Sun, 21 Jan 2007 08:58:19 +0000 (-0300)
Subject: V4L/DVB (5114): Cx88: Add support for svideo/composite input of the Terratec Cinergy... 
X-Git-Tag: v2.6.21-rc2~66^2~105
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05eda24968a6bb7082b632769bd72126f85485a6;p=linux-2.6

V4L/DVB (5114): Cx88: Add support for svideo/composite input of the Terratec Cinergy 1400 DVB-T

Adds support for the combined S-Video/Composite input of the
Terratec Cinergy 1400 DVB-T.

Signed-off-by: Heiko Baums <heiko@baums-on-web.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 434b78ab37..65e9d8096b 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -764,6 +764,12 @@ struct cx88_board cx88_boards[] = {
 		.input          = {{
 			.type   = CX88_VMUX_DVB,
 			.vmux   = 0,
+		},{
+			.type   = CX88_VMUX_COMPOSITE1,
+			.vmux   = 2,
+		},{
+			.type   = CX88_VMUX_SVIDEO,
+			.vmux   = 2,
 		}},
 		.mpeg           = CX88_MPEG_DVB,
 	},