Merge ../torvalds-2.6/

[pandora-kernel.git] / drivers / media / dvb / frontends / Kconfig

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 75fb556..a50a41f 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -40,6 +40,12 @@ config DVB_VES1X93
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
+config DVB_S5H1420
+       tristate "Samsung S5H1420 based"
+       depends on DVB_CORE
+       help
+         A DVB-S tuner module. Say Y when you want to support this frontend.
+
 comment "DVB-T (terrestrial) frontends"
        depends on DVB_CORE
 
@@ -173,4 +179,19 @@ config DVB_OR51132
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
          to support this frontend.
 
+config DVB_BCM3510
+       tristate "Broadcom BCM3510"
+       depends on DVB_CORE
+       select FW_LOADER
+       help
+         An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to
+         support this frontend.
+
+config DVB_LGDT330X
+       tristate "LG Electronics LGDT3302/LGDT3303 based"
+       depends on DVB_CORE
+       help
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
+
 endmenu