Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[cascardo/linux.git] / drivers / media / tuners / tda18212.h

diff --git a/drivers/media/tuners/tda18212.h b/drivers/media/tuners/tda18212.h
index c36b49e..e58c909 100644 (file)
--- a/drivers/media/tuners/tda18212.h
+++ b/drivers/media/tuners/tda18212.h
@@ -25,8 +25,6 @@
 #include "dvb_frontend.h"
 
 struct tda18212_config {
-       u8 i2c_address;
-
        u16 if_dvbt_6;
        u16 if_dvbt_7;
        u16 if_dvbt_8;
@@ -37,18 +35,11 @@ struct tda18212_config {
        u16 if_dvbc;
        u16 if_atsc_vsb;
        u16 if_atsc_qam;
-};
 
-#if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA18212)
-extern struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,
-       struct i2c_adapter *i2c, struct tda18212_config *cfg);
-#else
-static inline struct dvb_frontend *tda18212_attach(struct dvb_frontend *fe,
-       struct i2c_adapter *i2c, struct tda18212_config *cfg)
-{
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
-       return NULL;
-}
-#endif
+       /*
+        * pointer to DVB frontend
+        */
+       struct dvb_frontend *fe;
+};
 
 #endif