diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-04-22 17:46:13 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 17:07:53 (GMT) |
| commit | 967be9a9cd2de3f87dbf960620860143a50c1b64 (patch) | |
| tree | 57549d397b4f22d009e170e9464feda6e5b5807a /drivers/media | |
| parent | 0efad8127ac4b32af780d722258b42cfae02cdf2 (diff) | |
| download | linux-967be9a9cd2de3f87dbf960620860143a50c1b64.tar.xz | |
V4L/DVB (7411): use tuner-simple for Philips FCV1236D digital tuning support
Convert dvb-bt8xx to use tuner-simple instead of dvb-pll for Philips FCV1236D
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.c | 5 | ||||
| -rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 209356b..6d8b844 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -692,8 +692,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) case BTTV_BOARD_PC_HDTV: card->fe = dvb_attach(or51211_attach, &or51211_config, card->i2c_adapter); if (card->fe != NULL) - dvb_attach(dvb_pll_attach, card->fe, 0x61, - card->i2c_adapter, DVB_PLL_FCV1236D); + dvb_attach(simple_tuner_attach, card->fe, + card->i2c_adapter, 0x61, + TUNER_PHILIPS_FCV1236D); break; } diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h index 436880e..25a23c3 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h @@ -39,6 +39,7 @@ #include "lgdt330x.h" #include "zl10353.h" #include "dvb-pll.h" +#include "tuner-simple.h" struct dvb_bt8xx_card { struct mutex lock; diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 0c859d9..f239320 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h @@ -19,6 +19,7 @@ #include <media/ir-common.h> #include <media/ir-kbd-i2c.h> #include <media/i2c-addr.h> +#include <media/tuner.h> /* ---------------------------------------------------------- */ /* exported by bttv-cards.c */ diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 1305d31..03816b7 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h @@ -42,7 +42,6 @@ #include <linux/device.h> #include <media/videobuf-dma-sg.h> -#include <media/tuner.h> #include <media/tveeprom.h> #include <media/ir-common.h> |