diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 11:56:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 11:56:16 -0300 |
| commit | 1739deb9fa270e49dbcaa25a95796b4927cc4a78 (patch) | |
| tree | 0826713f0bccc8d9ecb8f972b09ac571ff1a5ffe /linux/drivers/media/video/saa7134/saa7134-cards.c | |
| parent | 2ba96e655011fe3e04a32e5498ef82485b930c6f (diff) | |
| parent | 313f7f3007cbbc618b5957b7e53e07ec1b4db88f (diff) | |
| download | mediapointer-dvb-s2-1739deb9fa270e49dbcaa25a95796b4927cc4a78.tar.gz mediapointer-dvb-s2-1739deb9fa270e49dbcaa25a95796b4927cc4a78.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/empire-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index c18b41ee6..3ab7732e6 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1633,7 +1633,7 @@ struct saa7134_board saa7134_boards[] = { }}, .radio = { .name = name_radio, - .amux = LINE1, + .amux = TV, .gpio = 0x00300001, }, .mute = { @@ -4900,7 +4900,7 @@ struct saa7134_board saa7134_boards[] = { /* Igor Kuznetsov <igk@igk.ru> */ .name = "Beholder BeholdTV H6", .audio_clock = 0x00187de7, - .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .tuner_type = TUNER_PHILIPS_FMD1216MEX_MK3, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, |