diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-12 18:42:21 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-12 18:42:21 -0300 |
| commit | 24d2656eda71a629c958936e8a6031300214f977 (patch) | |
| tree | 693b00c71eb4c6531163e6efa126fe18545714db /linux/drivers/media/video/cx88 | |
| parent | 6bee38194ba9451760aab353e5e825f98d639506 (diff) | |
| parent | fd865ea20e1c05d7e9b7d081632db5fa6ad32a3a (diff) | |
| download | mediapointer-dvb-s2-24d2656eda71a629c958936e8a6031300214f977.tar.gz mediapointer-dvb-s2-24d2656eda71a629c958936e8a6031300214f977.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/kernel-sync
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 825334ef3..6be16512a 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -886,6 +886,12 @@ struct cx88_board cx88_boards[] = { .input = {{ .type = CX88_VMUX_DVB, .vmux = 0, + },{ + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, + },{ + .type = CX88_VMUX_SVIDEO, + .vmux = 2, }}, .mpeg = CX88_MPEG_DVB, }, @@ -1955,14 +1961,14 @@ void cx88_card_setup(struct cx88_core *core) {0x13,0x04}, {0x16,0x00}, {0x14,0x04}, - {0x17,0x00} + {0x17,0x00} }; core->i2c_client.addr = 0x0a; for (i = 0; i < ARRAY_SIZE(buffer); i++) if (2 != i2c_master_send(&core->i2c_client, buffer[i],2)) - printk(KERN_WARNING + printk(KERN_WARNING "%s: Unable to enable " "tuner(%i).\n", core->name, i); |