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

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

diff --git a/drivers/media/dvb/frontends/tua6100.h b/drivers/media/dvb/frontends/tua6100.h
index 2e5d8fb8d9bab6606d103752413b7c4c7b1736b4..f83dbd5e42ae642dff9410681d1a114d08a17a3e 100644 (file)
--- a/drivers/media/dvb/frontends/tua6100.h
+++ b/drivers/media/dvb/frontends/tua6100.h
@@ -34,14 +34,14 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
-/**
- * Attach a tua6100 pll to the supplied frontend structure.
- *
- * @param fe Frontend to attach to.
- * @param addr i2c address of the pll.
- * @param i2c i2c adapter to use.
- * @return FE pointer on success, NULL on failure.
- */
+#if defined(CONFIG_DVB_TUA6100) || (defined(CONFIG_DVB_TUA6100_MODULE) && defined(MODULE))
 extern struct dvb_frontend *tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend* tua6100_attach(struct dvb_frontend *fe, int addr, struct i2c_adapter *i2c)
+{
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+       return NULL;
+}
+#endif // CONFIG_DVB_TUA6100
 
 #endif