Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

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

diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 498a4f2a6fc37b3efd6459752aa153453e9671c5..e8c6554a47aa13761ca8016cb0cd7d066e38927a 100644 (file)
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -447,13 +447,6 @@ config DVB_EC100
        help
          Say Y when you want to support this frontend.
 
-config DVB_HD29L2
-       tristate "HDIC HD29L2"
-       depends on DVB_CORE && I2C
-       default m if !MEDIA_SUBDRV_AUTOSELECT
-       help
-         Say Y when you want to support this frontend.
-
 config DVB_STV0367
        tristate "ST STV0367 based"
        depends on DVB_CORE && I2C
@@ -513,6 +506,13 @@ config DVB_AS102_FE
        depends on DVB_CORE
        default DVB_AS102
 
+config DVB_ZD1301_DEMOD
+       tristate "ZyDAS ZD1301"
+       depends on DVB_CORE && I2C
+       default m if !MEDIA_SUBDRV_AUTOSELECT
+       help
+         Say Y when you want to support this frontend.
+
 config DVB_GP8PSK_FE
        tristate
        depends on DVB_CORE
@@ -619,7 +619,7 @@ config DVB_LGDT3305
 
 config DVB_LGDT3306A
        tristate "LG Electronics LGDT3306A based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && I2C_MUX
        default m if !MEDIA_SUBDRV_AUTOSELECT
        help
          An ATSC 8VSB and QAM-B 64/256 demodulator module. Say Y when you want