diff options
| author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-08-08 09:10:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:53:25 -0300 |
| commit | 102a342bb9672f67a34fd185803aaded4ce8dd0f (patch) | |
| tree | 2dffbcbe618d16036c5e3227e8bd003714553b0b /drivers/media/dvb/frontends/cx24110.h | |
| parent | 2bfe031df6bd5e3b8e503eba8e3b6461d7c2c27e (diff) | |
| download | op-kernel-dev-102a342bb9672f67a34fd185803aaded4ce8dd0f.zip op-kernel-dev-102a342bb9672f67a34fd185803aaded4ce8dd0f.tar.gz | |
V4L/DVB (4387): Add Kconfig infrastructure for dvb_attach
Allow it to be en/disabled
Disable it in < 2.6.17 due to symbol_xxx() bug
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/cx24110.h')
| -rw-r--r-- | drivers/media/dvb/frontends/cx24110.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/cx24110.h b/drivers/media/dvb/frontends/cx24110.h index 9c2b76e..c9d5ae2 100644 --- a/drivers/media/dvb/frontends/cx24110.h +++ b/drivers/media/dvb/frontends/cx24110.h @@ -33,9 +33,6 @@ struct cx24110_config u8 demod_address; }; -extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, - struct i2c_adapter* i2c); - static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val) { int r = 0; u8 buf[] = {(u8) (val>>24), (u8) (val>>16), (u8) (val>>8)}; @@ -44,4 +41,16 @@ static inline int cx24110_pll_write(struct dvb_frontend *fe, u32 val) { return r; } +#if defined(CONFIG_DVB_CX24110) || defined(CONFIG_DVB_CX24110_MODULE) +extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, + struct i2c_adapter* i2c); +#else +static inline struct dvb_frontend* cx24110_attach(const struct cx24110_config* config, + struct i2c_adapter* i2c) +{ + printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); + return NULL; +} +#endif // CONFIG_DVB_CX24110 + #endif // CX24110_H |
