summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-09-07 04:31:55 +0100
committerAndrew de Quincey <adq_dvb@lidskialf.net>2006-09-07 04:31:55 +0100
commitc68391a0174c4ec59e46866157eb14204d4ee033 (patch)
tree7fe0ac5d24e74863bfcb43316fb2ebc16994e9fa
parent73417c50a08d93d5c209df8a49c8d0a0e0d0dc8b (diff)
downloadmediapointer-dvb-s2-c68391a0174c4ec59e46866157eb14204d4ee033.tar.gz
mediapointer-dvb-s2-c68391a0174c4ec59e46866157eb14204d4ee033.tar.bz2
Add tua6100 config wrapper
From: Andrew de Quincey <adq_dvb@lidskialf.net> I had forgotten to add the wrapper round the tua6100_attach function if its disabled in Kconfig Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
-rw-r--r--linux/drivers/media/dvb/frontends/tua6100.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/frontends/tua6100.h b/linux/drivers/media/dvb/frontends/tua6100.h
index 2e5d8fb8d..8f98033ff 100644
--- a/linux/drivers/media/dvb/frontends/tua6100.h
+++ b/linux/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)
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", __FUNCTION__);
+ return NULL;
+}
+#endif // CONFIG_DVB_TUA6100
#endif