---

yaml --- r: 37464 b: refs/heads/master c: 92cd24f h: refs/heads/master v: v3
git-mirror · Sep 26, 2006 · 44b276b · 44b276b
1 parent 1d64e72
commit 44b276b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 141276b57e1f83a86b8e77554b36511be0a7049c
+refs/heads/master: 92cd24fea4feefb9bde8efab3fdb25f525220672
diff --git a/trunk/drivers/media/dvb/frontends/tua6100.h b/trunk/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