Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

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

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index ae3659be323f4a81affada84ad6fa4b6437f15c1..c20553c4da1faa4645b44cf6d77417c897bf0bdb 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/ZL10313 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,26 +71,33 @@ 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
 
 config DVB_SP8870
        tristate "Spase sp8870 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -89,7 +110,7 @@ config DVB_SP8870
 
 config DVB_SP887X
        tristate "Spase sp887x based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -123,7 +144,7 @@ config DVB_L64781
 
 config DVB_TDA1004X
        tristate "Philips TDA10045H/TDA10046H based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -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 && HOTPLUG
+       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
 
@@ -224,7 +253,7 @@ comment "ATSC (North American/Korean Terrestrial/Cable DTV) frontends"
 
 config DVB_NXT200X
        tristate "NxtWave Communications NXT2002/NXT2004 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -239,7 +268,7 @@ config DVB_NXT200X
 
 config DVB_OR51211
        tristate "Oren OR51211 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -252,7 +281,7 @@ config DVB_OR51211
 
 config DVB_OR51132
        tristate "Oren OR51132 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -268,7 +297,7 @@ config DVB_OR51132
 
 config DVB_BCM3510
        tristate "Broadcom BCM3510"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && HOTPLUG
        default m if DVB_FE_CUSTOMISE
        select FW_LOADER
        help
@@ -299,7 +328,15 @@ config DVB_AU8522
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
          to support this frontend.
 
-comment "Tuners/PLL support"
+config DVB_S5H1411
+       tristate "Samsung S5H1411 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 "Digital terrestrial only tuners/PLL"
        depends on DVB_CORE
 
 config DVB_PLL
@@ -310,55 +347,6 @@ config DVB_PLL
          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.
-
-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_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.
-
-config DVB_TUNER_QT1010
-       tristate "Quantek QT1010 silicon tuner"
-       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.
-
 config DVB_TUNER_DIB0070
        tristate "DiBcom DiB0070 silicon base-band tuner"
        depends on I2C
@@ -368,21 +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.
-
-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
-
-comment "Miscellaneous devices"
+comment "SEC control devices for DVB-S"
        depends on DVB_CORE
 
 config DVB_LNBP21
@@ -406,11 +380,4 @@ config DVB_ISL6421
        help
          An SEC control chip.
 
-config DVB_TUA6100
-       tristate "TUA6100 PLL"
-       depends on DVB_CORE && I2C
-       default m if DVB_FE_CUSTOMISE
-       help
-         A DVBS PLL chip.
-
 endmenu