From 44b276bf01f71572c216fb21141d1f31acc35cf4 Mon Sep 17 00:00:00 2001 From: Andrew de Quincey Date: Thu, 7 Sep 2006 00:31:55 -0300 Subject: [PATCH] --- yaml --- r: 37464 b: refs/heads/master c: 92cd24fea4feefb9bde8efab3fdb25f525220672 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/tua6100.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 27d682da02f2..325440b255bf 100644 --- 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 index 2e5d8fb8d9ba..8f98033ffa7b 100644 --- a/trunk/drivers/media/dvb/frontends/tua6100.h +++ b/trunk/drivers/media/dvb/frontends/tua6100.h @@ -34,14 +34,14 @@ #include #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