diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-11 13:56:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:55:52 -0400 |
commit | fd0b0814a4ac6003d84042964c0c2923435539cd (patch) | |
tree | f7762918d185adbec07851b3d4155a37124b694e /drivers/media | |
parent | f165f60d4229ec4f34002f8dcae45a023586c8d7 (diff) |
[media] dvb: don't cause missing symbols for drxk/tda18271c2dd
If those demods are unselected, but a bridge driver requires them,
produce a runtime message, instead of missing symbols.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/frontends/drxk.h | 12 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/tda18271c2dd.h | 14 |
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/drxk.h b/drivers/media/dvb/frontends/drxk.h index a756e4562fe..58baf419560 100644 --- a/drivers/media/dvb/frontends/drxk.h +++ b/drivers/media/dvb/frontends/drxk.h | |||
@@ -29,7 +29,19 @@ struct drxk_config { | |||
29 | const char *microcode_name; | 29 | const char *microcode_name; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | #if defined(CONFIG_DVB_DRXK) || (defined(CONFIG_DVB_DRXK_MODULE) \ | ||
33 | && defined(MODULE)) | ||
32 | extern struct dvb_frontend *drxk_attach(const struct drxk_config *config, | 34 | extern struct dvb_frontend *drxk_attach(const struct drxk_config *config, |
33 | struct i2c_adapter *i2c, | 35 | struct i2c_adapter *i2c, |
34 | struct dvb_frontend **fe_t); | 36 | struct dvb_frontend **fe_t); |
37 | #else | ||
38 | static inline struct dvb_frontend *drxk_attach(const struct drxk_config *config, | ||
39 | struct i2c_adapter *i2c, | ||
40 | struct dvb_frontend **fe_t) | ||
41 | { | ||
42 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); | ||
43 | return NULL; | ||
44 | } | ||
45 | #endif | ||
46 | |||
35 | #endif | 47 | #endif |
diff --git a/drivers/media/dvb/frontends/tda18271c2dd.h b/drivers/media/dvb/frontends/tda18271c2dd.h index 492badd5023..5ac2da5fcf1 100644 --- a/drivers/media/dvb/frontends/tda18271c2dd.h +++ b/drivers/media/dvb/frontends/tda18271c2dd.h | |||
@@ -2,4 +2,18 @@ | |||
2 | #define _TDA18271C2DD_H_ | 2 | #define _TDA18271C2DD_H_ |
3 | struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe, | 3 | struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe, |
4 | struct i2c_adapter *i2c, u8 adr); | 4 | struct i2c_adapter *i2c, u8 adr); |
5 | |||
6 | #if defined(CONFIG_DVB_TDA18271C2DD) || (defined(CONFIG_DVB_TDA18271C2DD_MODULE) \ | ||
7 | && defined(MODULE)) | ||
8 | struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe, | ||
9 | struct i2c_adapter *i2c, u8 adr); | ||
10 | #else | ||
11 | static inline struct dvb_frontend *tda18271c2dd_attach(struct dvb_frontend *fe, | ||
12 | struct i2c_adapter *i2c, u8 adr) { | ||
13 | { | ||
14 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); | ||
15 | return NULL; | ||
16 | } | ||
17 | #endif | ||
18 | |||
5 | #endif | 19 | #endif |