Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index fe0ddcc..5a13454 100644 (file)
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -471,6 +471,11 @@ config DVB_SI2168
        help
          Say Y when you want to support this frontend.
 
+config DVB_AS102_FE
+       tristate
+       depends on DVB_CORE
+       default DVB_AS102
+
 comment "DVB-C (cable) frontends"
        depends on DVB_CORE
 
@@ -643,6 +648,14 @@ config DVB_MB86A20S
          A driver for Fujitsu mb86a20s ISDB-T/ISDB-Tsb demodulator.
          Say Y when you want to support this frontend.
 
+config DVB_TC90522
+       tristate "Toshiba TC90522"
+       depends on DVB_CORE && I2C
+       default m if !MEDIA_SUBDRV_AUTOSELECT
+       help
+         A Toshiba TC90522 2xISDB-T + 2xISDB-S demodulator.
+         Say Y when you want to support this frontend.
+
 comment "Digital terrestrial only tuners/PLL"
        depends on DVB_CORE
 
@@ -720,6 +733,13 @@ config DVB_A8293
        depends on DVB_CORE && I2C
        default m if !MEDIA_SUBDRV_AUTOSELECT
 
+config DVB_SP2
+       tristate "CIMaX SP2"
+       depends on DVB_CORE && I2C
+       default m if !MEDIA_SUBDRV_AUTOSELECT
+       help
+         CIMaX SP2/SP2HF Common Interface module.
+
 config DVB_LGS8GL5
        tristate "Silicon Legend LGS-8GL5 demodulator (OFDM)"
        depends on DVB_CORE && I2C