Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / Kconfig

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 22c2cf2cea9885a4a967ae4c290a9c2c76a69601..59b9ed1f1aec6b5f8769d17bc11389d195577e7f 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -205,6 +205,13 @@ config DVB_TDA10021
        help
          A DVB-C tuner module. Say Y when you want to support this frontend.
 
+config DVB_TDA10023
+       tristate "Philips TDA10023 based"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A DVB-C tuner module. Say Y when you want to support this frontend.
+
 config DVB_STV0297
        tristate "ST STV0297 based"
        depends on DVB_CORE && I2C
@@ -276,12 +283,24 @@ config DVB_LGDT330X
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
          to support this frontend.
 
+config DVB_S5H1409
+       tristate "Samsung S5H1409 based"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
+
 comment "Tuners/PLL support"
        depends on DVB_CORE
 
 config DVB_PLL
-       tristate
+       tristate "Generic I2C PLL based tuners"
        depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         This module drives a number of tuners based on PLL chips with a
+         common I2C interface. Say Y when you want to support these tuners.
 
 config DVB_TDA826X
        tristate "Philips TDA826X silicon tuner"
@@ -290,6 +309,13 @@ config DVB_TDA826X
        help
          A DVB-S silicon tuner module. Say Y when you want to support this tuner.
 
+config DVB_TDA827X
+       tristate "Philips TDA827X silicon tuner"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A DVB-T silicon tuner module. Say Y when you want to support this tuner.
+
 config DVB_TUNER_QT1010
        tristate "Quantek QT1010 silicon tuner"
        depends on DVB_CORE && I2C
@@ -304,13 +330,28 @@ config DVB_TUNER_MT2060
        help
          A driver for the silicon IF tuner MT2060 from Microtune.
 
-config DVB_TUNER_LGH06XF
-       tristate "LG TDVS-H06xF ATSC tuner"
-       depends on DVB_CORE && I2C
-       select DVB_PLL
+config DVB_TUNER_MT2266
+       tristate "Microtune MT2266 silicon tuner"
+       depends on I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A driver for the silicon baseband tuner MT2266 from Microtune.
+
+config DVB_TUNER_MT2131
+       tristate "Microtune MT2131 silicon tuner"
+       depends on I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A driver for the silicon baseband tuner MT2131 from Microtune.
+
+config DVB_TUNER_DIB0070
+       tristate "DiBcom DiB0070 silicon base-band tuner"
+       depends on I2C
        default m if DVB_FE_CUSTOMISE
        help
-         A driver for the LG TDVS-H06xF ATSC tuner family.
+         A driver for the silicon baseband tuner DiB0070 from DiBcom.
+         This device is only used inside a SiP called togther with a
+         demodulator for now.
 
 comment "Miscellaneous devices"
        depends on DVB_CORE