diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-11 10:16:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-11 10:16:50 -0200 |
| commit | c04d5624259264dee07b78787754eb87b2f0af76 (patch) | |
| tree | 384ff2b021427c823e95cfa11f985ffb6bd74cd2 /linux/drivers/media/video/saa7134 | |
| parent | d693688003ff6719bc5d00b8957871ab127461bb (diff) | |
| parent | 64258f263ffc8746f1365db19d6c2800c871d1bf (diff) | |
| download | mediapointer-dvb-s2-c04d5624259264dee07b78787754eb87b2f0af76.tar.gz mediapointer-dvb-s2-c04d5624259264dee07b78787754eb87b2f0af76.tar.bz2 | |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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-dvb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 02a4f7dbd..3ca2378b9 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -841,6 +841,7 @@ static struct tda1004x_config ads_tech_duo_config = { static struct tda10086_config flydvbs = { .demod_address = 0x0e, .invert = 0, + .diseqc_tone = 0, }; /* ================================================================== @@ -955,9 +956,9 @@ static int dvb_init(struct saa7134_dev *dev) configure_tda827x_fe(dev, &tda827x_lifeview_config); break; case SAA7134_BOARD_FLYDVB_TRIO: - if(! use_frontend) { //terrestrial + if(! use_frontend) { /* terrestrial */ configure_tda827x_fe(dev, &lifeview_trio_config); - } else { //satellite + } else { /* satellite */ dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); if (dev->dvb.frontend) { if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63, |