From 92cd24fea4feefb9bde8efab3fdb25f525220672 Mon Sep 17 00:00:00 2001 From: Andrew de Quincey Date: Thu, 7 Sep 2006 00:31:55 -0300 Subject: [PATCH] V4L/DVB (4610): Add tua6100 config wrapper I had forgotten to add the wrapper round the tua6100_attach function if its disabled in Kconfig Signed-off-by: Andrew de Quincey Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/frontends/tua6100.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/dvb/frontends/tua6100.h b/drivers/media/dvb/frontends/tua6100.h index 2e5d8fb8d9b..8f98033ffa7 100644 --- a/drivers/media/dvb/frontends/tua6100.h +++ b/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 -- 2.41.1