diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-03 15:23:14 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-03 15:23:14 -0200 |
| commit | 3dcb7f860446e00fa66038331d0c68662f726a7a (patch) | |
| tree | e44e88d4571b0ee7d1bf29fca60251ba007f4535 /linux/drivers/media/video/saa7134/saa7134-cards.c | |
| parent | 81c351c02f6ad4d967f24dc5f132fc6f5a755570 (diff) | |
| parent | 89200e6a6d61a33ac655f8992e95304c2995924d (diff) | |
| download | mediapointer-dvb-s2-3dcb7f860446e00fa66038331d0c68662f726a7a.tar.gz mediapointer-dvb-s2-3dcb7f860446e00fa66038331d0c68662f726a7a.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 6f8f73b12..85ed1ecae 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -335,7 +335,7 @@ struct saa7134_board saa7134_boards[] = { .tv = 1, },{ .name = name_comp1, - .vmux = 2, + .vmux = 0, .amux = LINE1, },{ .name = name_comp2, @@ -350,6 +350,10 @@ struct saa7134_board saa7134_boards[] = { .name = name_radio, .amux = LINE2, }, + .mute = { + .name = name_mute, + .amux = TV, + }, }, [SAA7134_BOARD_TVSTATION_RDS] = { /* Typhoon TV Tuner RDS: Art.Nr. 50694 */ @@ -566,6 +570,10 @@ struct saa7134_board saa7134_boards[] = { .radio = { .name = name_radio, .amux = LINE2, + }, + .mute = { + .name = name_mute, + .amux = TV, }, }, [SAA7134_BOARD_TYPHOON_90031] = { |