Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[linux-2.6] / drivers / media / dvb / frontends / tda1004x.h

diff --git a/drivers/media/dvb/frontends/tda1004x.h b/drivers/media/dvb/frontends/tda1004x.h
index 886db3f75d5686c535e5572be53525f7c95f73e0..4e27ffb0f14e80d189056e66b8e6822e593d31a3 100644 (file)
--- a/drivers/media/dvb/frontends/tda1004x.h
+++ b/drivers/media/dvb/frontends/tda1004x.h
@@ -61,6 +61,11 @@ enum tda10046_if {
        TDA10046_FREQ_052,              /* low IF, 5.1667 MHZ for tda9889 */
 };
 
+enum tda10046_tsout {
+       TDA10046_TS_PARALLEL  = 0x00,   /* parallel transport stream, default */
+       TDA10046_TS_SERIAL    = 0x01,   /* serial transport stream */
+};
+
 struct tda1004x_config
 {
        /* the demodulator's i2c address */
@@ -72,6 +77,9 @@ struct tda1004x_config
        /* Does the OCLK signal need inverted? */
        u8 invert_oclk;
 
+       /* parallel or serial transport stream */
+       enum tda10046_tsout ts_mode;
+
        /* Xtal frequency, 4 or 16MHz*/
        enum tda10046_xtal xtal_freq;
 
@@ -86,7 +94,6 @@ struct tda1004x_config
 
        /* slave address and configuration of the tuner */
        u8 tuner_address;
-       u8 tuner_config;
        u8 antenna_switch;
 
        /* if the board uses another I2c Bridge (tda8290), its address */
@@ -106,9 +113,6 @@ struct tda1004x_state {
        const struct tda1004x_config* config;
        struct dvb_frontend frontend;
 
-       /* this allows to store probed board information */
-       int     conf_probed;
-
        /* private demod data */
        enum tda1004x_demod demod_type;
 };
@@ -123,13 +127,13 @@ extern struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config
 static inline struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
                                            struct i2c_adapter* i2c)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 static inline struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
                                            struct i2c_adapter* i2c)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif // CONFIG_DVB_TDA1004X