diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 14:41:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 14:41:56 -0300 |
| commit | 24fde1a5a09b01f9b7557998aa9a88cff2ac844b (patch) | |
| tree | 5f99adf7717ce36a3460d43a6cf05a6d043074a5 /linux/drivers/media/video/saa7134 | |
| parent | 82fac24573672f22d2c906f30045a40740ad8370 (diff) | |
| parent | 016e2c55c79d9394c22e6bfd93ef073caa766706 (diff) | |
| download | mediapointer-dvb-s2-24fde1a5a09b01f9b7557998aa9a88cff2ac844b.tar.gz mediapointer-dvb-s2-24fde1a5a09b01f9b7557998aa9a88cff2ac844b.tar.bz2 | |
Merging hhackmann tree.
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -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 17f71932a..c67893b04 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -2215,7 +2215,7 @@ struct saa7134_board saa7134_boards[] = { .radio_type = UNSET, .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv, @@ -2239,7 +2239,7 @@ struct saa7134_board saa7134_boards[] = { .radio_type = UNSET, .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv, |