summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHeiko Baums <heiko@baums-on-web.de>2007-01-21 05:58:19 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:47 -0200
commit05eda24968a6bb7082b632769bd72126f85485a6 (patch)
tree686c342e17b206eb709a715382e1c249fa0b09b7 /drivers/media
parent4cbca185e9adf3d48205b60bf196ebb9882af043 (diff)
downloadtalos-op-linux-05eda24968a6bb7082b632769bd72126f85485a6.tar.gz
talos-op-linux-05eda24968a6bb7082b632769bd72126f85485a6.zip
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 434b78ab37d8..65e9d8096b74 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,
},
OpenPOWER on IntegriCloud