Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / drivers / media / dvb / frontends / Kconfig

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 9ad86ce4a4e5b783e0d8627e2b30b0f816ef8245..6d2384605927190abaa5394672fd191fb9a6a6e6 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -15,22 +15,36 @@ config DVB_FE_CUSTOMISE
 comment "DVB-S (satellite) frontends"
        depends on DVB_CORE
 
-config DVB_STV0299
-       tristate "ST STV0299 based"
+config DVB_CX24110
+       tristate "Conexant CX24110 based"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_CX24110
-       tristate "Conexant CX24110 based"
+config DVB_CX24123
+       tristate "Conexant CX24123 based"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_CX24123
-       tristate "Conexant CX24123 based"
+config DVB_MT312
+       tristate "Zarlink VP310/MT312 based"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       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 && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A DVB-S tuner module. Say Y when you want to support this frontend.
+
+config DVB_STV0299
+       tristate "ST STV0299 based"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
@@ -43,8 +57,8 @@ config DVB_TDA8083
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_MT312
-       tristate "Zarlink VP310/MT312 based"
+config DVB_TDA10086
+       tristate "Philips TDA10086 based"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
@@ -57,19 +71,26 @@ 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"
+config DVB_TUNER_ITD1000
+       tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_TDA10086
-       tristate "Philips TDA10086 based"
+config DVB_TDA826X
+       tristate "Philips TDA826X silicon tuner"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
-         A DVB-S tuner module. Say Y when you want to support this frontend.
+         A DVB-S silicon tuner module. Say Y when you want to support this tuner.
+
+config DVB_TUA6100
+       tristate "Infineon TUA6100 PLL"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A DVB-S PLL chip.
 
 comment "DVB-T (terrestrial) frontends"
        depends on DVB_CORE
@@ -188,6 +209,14 @@ config DVB_DIB7000P
          A DVB-T tuner module. Designed for mobile usage. Say Y when you want
          to support this frontend.
 
+config DVB_TDA10048
+       tristate "Philips TDA10048HN based"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       select FW_LOADER
+       help
+         A DVB-T tuner module. Say Y when you want to support this frontend.
+
 comment "DVB-C (cable) frontends"
        depends on DVB_CORE
 
@@ -291,65 +320,32 @@ config DVB_S5H1409
          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 "Generic I2C PLL based tuners"
+config DVB_AU8522
+       tristate "Auvitek AU8522 based"
        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"
-       depends on DVB_CORE && I2C
-       default m if DVB_FE_CUSTOMISE
-       help
-         A DVB-S silicon tuner module. Say Y when you want to support this tuner.
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
 
-config DVB_TDA827X
-       tristate "Philips TDA827X silicon tuner"
+config DVB_S5H1411
+       tristate "Samsung S5H1411 based"
        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.
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
 
-config DVB_TDA18271
-       tristate "NXP TDA18271 silicon tuner"
-       depends on I2C
-       default m if DVB_FE_CUSTOMISE
-       help
-         A silicon tuner module. Say Y when you want to support this tuner.
+comment "Digital terrestrial only tuners/PLL"
+       depends on DVB_CORE
 
-config DVB_TUNER_QT1010
-       tristate "Quantek QT1010 silicon tuner"
+config DVB_PLL
+       tristate "Generic I2C PLL based tuners"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
-         A driver for the silicon tuner QT1010 from Quantek.
-
-config DVB_TUNER_MT2060
-       tristate "Microtune MT2060 silicon IF tuner"
-       depends on I2C
-       default m if DVB_FE_CUSTOMISE
-       help
-         A driver for the silicon IF tuner MT2060 from Microtune.
-
-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.
+         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_TUNER_DIB0070
        tristate "DiBcom DiB0070 silicon base-band tuner"
@@ -360,16 +356,7 @@ config DVB_TUNER_DIB0070
          This device is only used inside a SiP called togther with a
          demodulator for now.
 
-config DVB_TUNER_XC5000
-       tristate "Xceive XC5000 silicon tuner"
-       depends on I2C
-       default m if DVB_FE_CUSTOMISE
-       help
-         A driver for the silicon tuner XC5000 from Xceive.
-         This device is only used inside a SiP called togther with a
-         demodulator for now.
-
-comment "Miscellaneous devices"
+comment "SEC control devices for DVB-S"
        depends on DVB_CORE
 
 config DVB_LNBP21
@@ -379,18 +366,18 @@ config DVB_LNBP21
        help
          An SEC control chip.
 
-config DVB_ISL6421
-       tristate "ISL6421 SEC controller"
+config DVB_ISL6405
+       tristate "ISL6405 SEC controller"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
          An SEC control chip.
 
-config DVB_TUA6100
-       tristate "TUA6100 PLL"
+config DVB_ISL6421
+       tristate "ISL6421 SEC controller"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
-         A DVBS PLL chip.
+         An SEC control chip.
 
 endmenu