diff options
| author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-07-28 23:10:25 +0100 |
|---|---|---|
| committer | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-07-28 23:10:25 +0100 |
| commit | ab936b443d684bd023ba22857d6b4b58c22c0db7 (patch) | |
| tree | 7a3d7c9a9b575df59c8bcccfbf4ccee4f92459f8 /linux/drivers/media/dvb/bt8xx | |
| parent | a32e2e3de20c2e2ed969f30b49ebc9efd04f8e81 (diff) | |
| download | mediapointer-dvb-s2-ab936b443d684bd023ba22857d6b4b58c22c0db7.tar.gz mediapointer-dvb-s2-ab936b443d684bd023ba22857d6b4b58c22c0db7.tar.bz2 | |
Add Kconfig infrastructure for dvb_attach
From: Andrew de Quincey <adq_dvb@lidskialf.net>
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>
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/Kconfig | 14 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dst.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/Kconfig b/linux/drivers/media/dvb/bt8xx/Kconfig index f39400211..fc82b9842 100644 --- a/linux/drivers/media/dvb/bt8xx/Kconfig +++ b/linux/drivers/media/dvb/bt8xx/Kconfig @@ -1,13 +1,13 @@ config DVB_BT8XX tristate "BT8xx based PCI cards" depends on DVB_CORE && PCI && I2C && VIDEO_BT848 - select DVB_MT352 - select DVB_SP887X - select DVB_NXT6000 - select DVB_CX24110 - select DVB_OR51211 - select DVB_LGDT330X - select DVB_ZL10353 + select DVB_MT352 if !DVB_FE_CUSTOMISE + select DVB_SP887X if !DVB_FE_CUSTOMISE + select DVB_NXT6000 if !DVB_FE_CUSTOMISE + select DVB_CX24110 if !DVB_FE_CUSTOMISE + select DVB_OR51211 if !DVB_FE_CUSTOMISE + select DVB_LGDT330X if !DVB_FE_CUSTOMISE + select DVB_ZL10353 if !DVB_FE_CUSTOMISE select FW_LOADER help Support for PCI cards based on the Bt8xx PCI bridge. Examples are diff --git a/linux/drivers/media/dvb/bt8xx/dst.c b/linux/drivers/media/dvb/bt8xx/dst.c index b1e05782d..8b3390def 100644 --- a/linux/drivers/media/dvb/bt8xx/dst.c +++ b/linux/drivers/media/dvb/bt8xx/dst.c @@ -1720,8 +1720,10 @@ static void dst_release(struct dvb_frontend *fe) { struct dst_state *state = fe->demodulator_priv; +#ifdef CONFIG_DVB_CORE_ATTACH if (state->dst_hw_cap & DST_TYPE_HAS_CA) symbol_put(dst_ca_attach); +#endif kfree(state); } |