diff options
author | Trent Piepho <xyzzy@speakeasy.org> | 2007-07-31 14:51:30 -0700 |
---|---|---|
committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-07-31 14:51:30 -0700 |
commit | 2bcdc66d8a156de4290d4d9aeb0fba107a8b3681 (patch) | |
tree | e7f42d83cb06edc0e45864655632b416865b0c2c /linux/drivers/media/dvb/frontends/mt2131.h | |
parent | 263fb70fae7c0cabc33984fc92f4a70f2503ef76 (diff) | |
download | mediapointer-dvb-s2-2bcdc66d8a156de4290d4d9aeb0fba107a8b3681.tar.gz mediapointer-dvb-s2-2bcdc66d8a156de4290d4d9aeb0fba107a8b3681.tar.bz2 |
mt2131 s5h1409: correct frontend selection logic
From: Trent Piepho <xyzzy@speakeasy.org>
If a card driver is compiled into the kernel and mt2131 or s5h1409 are
compiled as modules, the kernel won't link.
A compiled in driver can't use a module, so in this case the mt2131 or s5h1409
are effectively disabled w.r.t the compiled in driver and the stub attach
function should be used.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/mt2131.h')
-rw-r--r-- | linux/drivers/media/dvb/frontends/mt2131.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/mt2131.h b/linux/drivers/media/dvb/frontends/mt2131.h index 608f1f66c..1e4ffe7dc 100644 --- a/linux/drivers/media/dvb/frontends/mt2131.h +++ b/linux/drivers/media/dvb/frontends/mt2131.h @@ -30,7 +30,7 @@ struct mt2131_config { u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */ }; -#if defined(CONFIG_DVB_TUNER_MT2131) || defined(CONFIG_DVB_TUNER_MT2131_MODULE) +#if defined(CONFIG_DVB_TUNER_MT2131) || (defined(CONFIG_DVB_TUNER_MT2131_MODULE) && defined(MODULE)) extern struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2131_config *cfg, |