Pull release into acpica branch

[pandora-kernel.git] / drivers / media / dvb / ttpci / av7110.c

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 22b203f..87ea527 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1566,7 +1566,7 @@ static u8 alps_bsru6_inittab[] = {
        0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
        0x10, 0x3f,   // AGC2  0x3d
        0x11, 0x84,
-       0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+       0x12, 0xb9,
        0x15, 0xc9,   // lock detector threshold
        0x16, 0x00,
        0x17, 0x00,
@@ -1644,7 +1644,6 @@ static struct stv0299_config alps_bsru6_config = {
        .inittab = alps_bsru6_inittab,
        .mclk = 88000000UL,
        .invert = 1,
-       .enhanced_tuning = 0,
        .skip_reinit = 0,
        .lock_output = STV0229_LOCKOUTPUT_1,
        .volt13_op0_op1 = STV0299_VOLT13_OP1,
@@ -1669,7 +1668,7 @@ static u8 alps_bsbe1_inittab[] = {
        0x0e, 0x23,   /* alpha_tmg = 2, beta_tmg = 3 */
        0x10, 0x3f,   // AGC2  0x3d
        0x11, 0x84,
-       0x12, 0xb5,   // Lock detect: -64  Carrier freq detect:on
+       0x12, 0xb9,
        0x15, 0xc9,   // lock detector threshold
        0x16, 0x00,
        0x17, 0x00,
@@ -1721,7 +1720,6 @@ static struct stv0299_config alps_bsbe1_config = {
        .inittab = alps_bsbe1_inittab,
        .mclk = 88000000UL,
        .invert = 1,
-       .enhanced_tuning = 0,
        .skip_reinit = 0,
        .min_delay_ms = 100,
        .set_symbol_rate = alps_bsru6_set_symbol_rate,