Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h
index e452fc0bad11..c8e1d54ff262 100644
--- a/drivers/media/dvb/frontends/tda1004x.h
+++ b/drivers/media/dvb/frontends/tda1004x.h
@@ -32,10 +32,13 @@ struct tda1004x_config
         u8 demod_address;
 
         /* does the "inversion" need inverted? */
-        u8 invert:1;
+        u8 invert;
 
         /* Does the OCLK signal need inverted? */
-        u8 invert_oclk:1;
+        u8 invert_oclk;
+
+        /* value of N_I2C of the CONF_PLL3 register */
+        u8 n_i2c;
 
         /* PLL maintenance */
         int (*pll_init)(struct dvb_frontend* fe);