Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 75fb556..37d5e0a 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -16,20 +16,20 @@ config DVB_CX24110
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_TDA8083
-       tristate "Philips TDA8083 based"
+config DVB_CX24123
+       tristate "Conexant CX24123 based"
        depends on DVB_CORE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
-config DVB_TDA80XX
-       tristate "Philips TDA8044 or TDA8083 based"
+config DVB_TDA8083
+       tristate "Philips TDA8083 based"
        depends on DVB_CORE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
 
 config DVB_MT312
-       tristate "Zarlink MT312 based"
+       tristate "Zarlink VP310/MT312 based"
        depends on DVB_CORE
        help
          A DVB-S tuner module. Say Y when you want to support this frontend.
@@ -40,22 +40,29 @@ 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
 
 config DVB_SP8870
-       tristate "Spase sp8870 based"
+       tristate "Spase sp8870 based"
        depends on DVB_CORE
        select FW_LOADER
        help
-         A DVB-T tuner module. Say Y when you want to support this frontend.
+         A DVB-T tuner module. Say Y when you want to support this frontend.
 
          This driver needs external firmware. Please use the command
          "<kerneldir>/Documentation/dvb/get_dvb_firmware sp8870" to
-         download/extract it, and then copy it to /usr/lib/hotplug/firmware.
+         download/extract it, and then copy it to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
 
 config DVB_SP887X
-       tristate "Spase sp887x based"
+       tristate "Spase sp887x based"
        depends on DVB_CORE
        select FW_LOADER
        help
@@ -63,7 +70,8 @@ config DVB_SP887X
 
          This driver needs external firmware. Please use the command
          "<kerneldir>/Documentation/dvb/get_dvb_firmware sp887x" to
-         download/extract it, and then copy it to /usr/lib/hotplug/firmware.
+         download/extract it, and then copy it to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
 
 config DVB_CX22700
        tristate "Conexant CX22700 based"
@@ -72,10 +80,10 @@ config DVB_CX22700
          A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_CX22702
-       tristate "Conexant cx22702 demodulator (OFDM)"
-       depends on DVB_CORE
-       help
-         A DVB-T tuner module. Say Y when you want to support this frontend.
+       tristate "Conexant cx22702 demodulator (OFDM)"
+       depends on DVB_CORE
+       help
+         A DVB-T tuner module. Say Y when you want to support this frontend.
 
 config DVB_L64781
        tristate "LSI L64781"
@@ -92,8 +100,9 @@ config DVB_TDA1004X
 
          This driver needs external firmware. Please use the commands
          "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10045",
-         "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10046" to
-         download/extract them, and then copy them to /usr/lib/hotplug/firmware.
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware tda10046" to
+         download/extract them, and then copy them to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
 
 config DVB_NXT6000
        tristate "NxtWave Communications NXT6000 based"
@@ -107,6 +116,12 @@ config DVB_MT352
        help
          A DVB-T tuner module. Say Y when you want to support this frontend.
 
+config DVB_ZL10353
+       tristate "Zarlink ZL10353 based"
+       depends on DVB_CORE
+       help
+         A DVB-T tuner module. Say Y when you want to support this frontend.
+
 config DVB_DIB3000MB
        tristate "DiBcom 3000M-B"
        depends on DVB_CORE
@@ -124,23 +139,17 @@ config DVB_DIB3000MC
 comment "DVB-C (cable) frontends"
        depends on DVB_CORE
 
-config DVB_ATMEL_AT76C651
-       tristate "Atmel AT76C651 based"
-       depends on DVB_CORE
-       help
-         A DVB-C tuner module. Say Y when you want to support this frontend.
-
 config DVB_VES1820
        tristate "VLSI VES1820 based"
        depends on DVB_CORE
        help
-         A DVB-C tuner module. Say Y when you want to support this frontend.
+         A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_TDA10021
        tristate "Philips TDA10021 based"
        depends on DVB_CORE
        help
-         A DVB-C tuner module. Say Y when you want to support this frontend.
+         A DVB-C tuner module. Say Y when you want to support this frontend.
 
 config DVB_STV0297
        tristate "ST STV0297 based"
@@ -151,24 +160,58 @@ config DVB_STV0297
 comment "ATSC (North American/Korean Terresterial DTV) frontends"
        depends on DVB_CORE
 
-config DVB_NXT2002
-       tristate "Nxt2002 based"
+config DVB_NXT200X
+       tristate "NxtWave Communications NXT2002/NXT2004 based"
        depends on DVB_CORE
        select FW_LOADER
        help
-         An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
+
+         This driver needs external firmware. Please use the commands
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" and
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2004" to
+         download/extract them, and then copy them to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
 
 config DVB_OR51211
-       tristate "or51211 based (pcHDTV HD2000 card)"
+       tristate "Oren OR51211 based"
        depends on DVB_CORE
        select FW_LOADER
        help
          An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
+         This driver needs external firmware. Please use the command
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware or51211" to
+         download it, and then copy it to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
+
 config DVB_OR51132
-       tristate "OR51132 based (pcHDTV HD3000 card)"
+       tristate "Oren OR51132 based"
+       depends on DVB_CORE
+       select FW_LOADER
+       help
+         An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
+         to support this frontend.
+
+         This driver needs external firmware. Please use the commands
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware or51132_vsb" and/or
+         "<kerneldir>/Documentation/dvb/get_dvb_firmware or51132_qam" to
+         download firmwares for 8VSB and QAM64/256, respectively. Copy them to
+         /usr/lib/hotplug/firmware or /lib/firmware (depending on
+         configuration of firmware hotplug).
+
+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.