diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-21 22:29:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-21 22:29:50 -0200 |
| commit | 8ef9702ccb35d7d65c7ea35b0cdca3123107076e (patch) | |
| tree | 7fa82054d18c154a44bc56755c3ee74008e2fd63 /linux/drivers/media | |
| parent | dd42b625bb11836e6b71aaa6a87faea6fa1e4df0 (diff) | |
| parent | a5cce0416f7fd557fa427893ee9cef207c33813a (diff) | |
| download | mediapointer-dvb-s2-8ef9702ccb35d7d65c7ea35b0cdca3123107076e.tar.gz mediapointer-dvb-s2-8ef9702ccb35d7d65c7ea35b0cdca3123107076e.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 9a5aa0803..3a7131342 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -765,6 +765,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, }, |