diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-24 21:08:26 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-24 21:08:26 +0100 |
commit | db8862eafe8a5d030a3b02e81b8bb47447c315e3 (patch) | |
tree | 073ea7b46809bf804134cbf008a593413c02a99c /drivers/media/dvb/bt8xx/Kconfig | |
parent | x86, bts: memory accounting (diff) | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
download | linux-db8862eafe8a5d030a3b02e81b8bb47447c315e3.tar.xz linux-db8862eafe8a5d030a3b02e81b8bb47447c315e3.zip |
Merge branch 'linus' into tracing/hw-branch-tracing
Diffstat (limited to 'drivers/media/dvb/bt8xx/Kconfig')
-rw-r--r-- | drivers/media/dvb/bt8xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig index 7e9c090fc04e..27edb0ece587 100644 --- a/drivers/media/dvb/bt8xx/Kconfig +++ b/drivers/media/dvb/bt8xx/Kconfig @@ -8,7 +8,7 @@ config DVB_BT8XX select DVB_OR51211 if !DVB_FE_CUSTOMISE select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE help Support for PCI cards based on the Bt8xx PCI bridge. Examples are the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards, |