diff --git a/[refs] b/[refs] index b6f399519e5a..42f62f1e73e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92782bb00387585e2a4249f6996da3c863c1f580 +refs/heads/master: ee5e7d94c96ae5a95906fcecde6c69c9d9ee4352 diff --git a/trunk/drivers/media/dvb/frontends/stv6110.h b/trunk/drivers/media/dvb/frontends/stv6110.h index 2574e1fba9d7..9db2402410f6 100644 --- a/trunk/drivers/media/dvb/frontends/stv6110.h +++ b/trunk/drivers/media/dvb/frontends/stv6110.h @@ -41,7 +41,6 @@ struct stv6110_config { u8 i2c_address; u32 mclk; - int iq_wiring; u8 clk_div; /* divisor value for the output clock */ }; diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c index f87a023a7351..58478daba88a 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-dvb.c +++ b/trunk/drivers/media/video/cx23885/cx23885-dvb.c @@ -409,13 +409,11 @@ static struct stv0900_config netup_stv0900_config = { static struct stv6110_config netup_stv6110_tunerconfig_a = { .i2c_address = 0x60, .mclk = 27000000, - .iq_wiring = 0, }; static struct stv6110_config netup_stv6110_tunerconfig_b = { .i2c_address = 0x63, .mclk = 27000000, - .iq_wiring = 1, }; static int tbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)