Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / media / dvb / frontends / zl10353.h

diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index 5cc4ae7..79a9472 100644 (file)
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -29,15 +29,23 @@ struct zl10353_config
        /* demodulator's I2C address */
        u8 demod_address;
 
-       /* function which configures the PLL buffer (for secondary I2C
-        * connected tuner) or tunes the PLL (for direct connected tuner) */
-       int (*pll_set)(struct dvb_frontend *fe,
-                      struct dvb_frontend_parameters *params, u8 *pllbuf);
+       /* set if no pll is connected to the secondary i2c bus */
+       int no_tuner;
+
+       /* set if parallel ts output is required */
+       int parallel_ts;
 };
 
+#if defined(CONFIG_DVB_ZL10353) || defined(CONFIG_DVB_ZL10353_MODULE)
 extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
                                           struct i2c_adapter *i2c);
-
-extern int zl10353_write(struct dvb_frontend *fe, u8 *ibuf, int ilen);
+#else
+static inline struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
+                                          struct i2c_adapter *i2c)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       return NULL;
+}
+#endif // CONFIG_DVB_ZL10353
 
 #endif /* ZL10353_H */