diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 18:26:16 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 18:26:16 -0200 |
| commit | 0991b38929edc3f7202157c6a1e04682ad9694cc (patch) | |
| tree | 3176f3d96c1a7909ca2a867fe67e3a89027fef5d /linux/drivers/media/dvb/bt8xx | |
| parent | d444e8da71bac607984628cfa49b0f89c02a2db9 (diff) | |
| parent | 0e856055f505320ad16b590b1b9b1ca5341064ab (diff) | |
| download | mediapointer-dvb-s2-0991b38929edc3f7202157c6a1e04682ad9694cc.tar.gz mediapointer-dvb-s2-0991b38929edc3f7202157c6a1e04682ad9694cc.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/Kconfig b/linux/drivers/media/dvb/bt8xx/Kconfig index dd66b60fb..cfd6fb729 100644 --- a/linux/drivers/media/dvb/bt8xx/Kconfig +++ b/linux/drivers/media/dvb/bt8xx/Kconfig @@ -7,7 +7,7 @@ config DVB_BT8XX select DVB_CX24110 if !DVB_FE_CUSTOMISE select DVB_OR51211 if !DVB_FE_CUSTOMISE select DVB_LGDT330X if !DVB_FE_CUSTOMISE - select DVB_TUNER_LGH06XF if !DVB_FE_CUSTOMISE + select DVB_PLL select DVB_ZL10353 if !DVB_FE_CUSTOMISE select FW_LOADER help diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index de7701f0f..75c28c3d9 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -611,7 +611,8 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) lgdt330x_reset(card); card->fe = dvb_attach(lgdt330x_attach, &tdvs_tua6034_config, card->i2c_adapter); if (card->fe != NULL) { - dvb_attach(lgh06xf_attach, card->fe, card->i2c_adapter); + dvb_attach(dvb_pll_attach, card->fe, 0x61, + card->i2c_adapter, &dvb_pll_lg_tdvs_h06xf); dprintk ("dvb_bt8xx: lgdt330x detected\n"); } break; diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h index a18b98ca9..66afc28a7 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h @@ -40,8 +40,8 @@ #include "cx24110.h" #include "or51211.h" #include "lgdt330x.h" -#include "lgh06xf.h" #include "zl10353.h" +#include "dvb-pll.h" struct dvb_bt8xx_card { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) |