diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 20:38:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 17:41:38 -0400 |
commit | 149ef72deeba57078216c9fa678baff392295853 (patch) | |
tree | 038cf488b424094b0dbe05a63a9cbb28f87eaaec /drivers/media/dvb/bt8xx | |
parent | f1784354f774e1fa4863fc6382296ef6ede26dc5 (diff) |
Rename common tuner Kconfig names to use the same
namespace for all of them.
Diffstat (limited to 'drivers/media/dvb/bt8xx')
-rw-r--r-- | drivers/media/dvb/bt8xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig index 902c762e0b7f..d1239b8342f8 100644 --- a/drivers/media/dvb/bt8xx/Kconfig +++ b/drivers/media/dvb/bt8xx/Kconfig | |||
@@ -8,7 +8,7 @@ config DVB_BT8XX | |||
8 | select DVB_OR51211 if !DVB_FE_CUSTOMISE | 8 | select DVB_OR51211 if !DVB_FE_CUSTOMISE |
9 | select DVB_LGDT330X if !DVB_FE_CUSTOMISE | 9 | select DVB_LGDT330X if !DVB_FE_CUSTOMISE |
10 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE | 10 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE |
11 | select TUNER_SIMPLE if !DVB_FE_CUSTOMISE | 11 | select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE |
12 | select FW_LOADER | 12 | select FW_LOADER |
13 | help | 13 | help |
14 | Support for PCI cards based on the Bt8xx PCI bridge. Examples are | 14 | Support for PCI cards based on the Bt8xx PCI bridge. Examples are |
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c index 75711bde23ad..a7637562e742 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/dvb/bt8xx/dst.c | |||
@@ -1714,7 +1714,7 @@ static void dst_release(struct dvb_frontend *fe) | |||
1714 | struct dst_state *state = fe->demodulator_priv; | 1714 | struct dst_state *state = fe->demodulator_priv; |
1715 | if (state->dst_ca) { | 1715 | if (state->dst_ca) { |
1716 | dvb_unregister_device(state->dst_ca); | 1716 | dvb_unregister_device(state->dst_ca); |
1717 | #ifdef CONFIG_DVB_CORE_ATTACH | 1717 | #ifdef CONFIG_MEDIA_ATTACH |
1718 | symbol_put(dst_ca_attach); | 1718 | symbol_put(dst_ca_attach); |
1719 | #endif | 1719 | #endif |
1720 | } | 1720 | } |