Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / media / video / tda8290.h

diff --git a/drivers/media/video/tda8290.h b/drivers/media/video/tda8290.h
index dbbcb0f001e07866f228e0bc905153ae3a8cf12d..dc8ef310b7b26b1fbccc6e24d321eb70d63caba2 100644 (file)
--- a/drivers/media/video/tda8290.h
+++ b/drivers/media/video/tda8290.h
@@ -18,32 +18,39 @@
 #define __TDA8290_H__
 
 #include <linux/i2c.h>
-#include "tuner-driver.h"
+#include "dvb_frontend.h"
+
+struct tda829x_config {
+       unsigned int *lna_cfg;
+       int (*tuner_callback) (void *dev, int command, int arg);
+
+       unsigned int probe_tuner:1;
+#define TDA829X_PROBE_TUNER 0
+#define TDA829X_DONT_PROBE  1
+};
 
 #if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE))
-extern int tda8290_probe(struct tuner *t);
+extern int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr);
 
-extern int tda8290_attach(struct tuner *t);
-extern int tda8295_attach(struct tuner *t);
+extern struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
+                                          struct i2c_adapter *i2c_adap,
+                                          u8 i2c_addr,
+                                          struct tda829x_config *cfg);
 #else
-static inline int tda8290_probe(struct tuner *t)
+static inline int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr)
 {
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
        return -EINVAL;
 }
 
-static inline int tda8290_attach(struct tuner *t)
+static inline struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
+                                                 struct i2c_adapter *i2c_adap,
+                                                 u8 i2c_addr,
+                                                 struct tda829x_config *cfg)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
               __FUNCTION__);
-       return -EINVAL;
-}
-
-static inline int tda8295_attach(struct tuner *t)
-{
-       printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
-       return -EINVAL;
+       return NULL;
 }
 #endif