diff options
Diffstat (limited to 'linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c index 2a7cb6eb2..441ffdf0d 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c @@ -13,11 +13,7 @@ #include "mt352.h" #include "nxt200x.h" #include "bcm3510.h" -#ifdef STV0297_CS2 -#include "stv0297_cs2.h" -#else #include "stv0297.h" -#endif #include "mt312.h" #include "lgdt330x.h" #include "dvb-pll.h" @@ -399,7 +395,6 @@ static int alps_tdee4_stv0297_tuner_set_params(struct dvb_frontend* fe, return 0; } -#ifndef STV0297_CS2 static u8 alps_tdee4_stv0297_inittab[] = { 0x80, 0x01, 0x80, 0x00, @@ -472,18 +467,12 @@ static u8 alps_tdee4_stv0297_inittab[] = { 0xdf, 0x01, 0xff, 0xff, }; -#endif static struct stv0297_config alps_tdee4_stv0297_config = { .demod_address = 0x1c, -#ifdef STV0297_CS2 - .fclk = STV0297_PAL_FCLK, - .demodfreq = STV0297_PAL_IF - STV0297_PAL_FCLK, -#else .inittab = alps_tdee4_stv0297_inittab, // .invert = 1, // .pll_set = alps_tdee4_stv0297_pll_set, -#endif }; /* try to figure out the frontend, each card/box can have on of the following list */ @@ -530,11 +519,7 @@ int flexcop_frontend_init(struct flexcop_device *fc) info("found the bcm3510 at i2c address: 0x%02x",air2pc_atsc_first_gen_config.demod_address); } else /* try the cable dvb (stv0297) */ -#ifdef STV0297_CS2 - if ((fc->fe = dvb_attach(stv0297_cs2_attach, &alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) { -#else if ((fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) { -#endif fc->dev_type = FC_CABLE; fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params; info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address); |