Merge branch 'linus' into xen-64bit

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

diff --git a/drivers/media/dvb/frontends/tda1002x.h b/drivers/media/dvb/frontends/tda1002x.h
index 4522b7ef53c91e1fc2d851457bfc03308295c7e0..04d19418bf2086254bb6dda50e8480bb176a9e72 100644 (file)
--- a/drivers/media/dvb/frontends/tda1002x.h
+++ b/drivers/media/dvb/frontends/tda1002x.h
@@ -32,6 +32,13 @@ struct tda1002x_config {
        u8 invert;
 };
 
+enum tda10023_output_mode {
+       TDA10023_OUTPUT_MODE_PARALLEL_A = 0xe0,
+       TDA10023_OUTPUT_MODE_PARALLEL_B = 0xa1,
+       TDA10023_OUTPUT_MODE_PARALLEL_C = 0xa0,
+       TDA10023_OUTPUT_MODE_SERIAL, /* TODO: not implemented */
+};
+
 struct tda10023_config {
        /* the demodulator's i2c address */
        u8 demod_address;
@@ -43,6 +50,9 @@ struct tda10023_config {
        u8 pll_p; /* defaults: 4 */
        u8 pll_n; /* defaults: 1 */
 
+       /* MPEG2 TS output mode */
+       u8 output_mode;
+
        /* input freq offset + baseband conversion type */
        u16 deltaf;
 };
@@ -66,7 +76,7 @@ extern struct dvb_frontend *tda10023_attach(
        struct i2c_adapter *i2c, u8 pwm);
 #else
 static inline struct dvb_frontend *tda10023_attach(
-       const struct tda1002x_config *config,
+       const struct tda10023_config *config,
        struct i2c_adapter *i2c, u8 pwm)
 {
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);