Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / frontends / Kconfig

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 96b27016670e3c7f18091e167057172767271feb..b8519ba511e5326373dd6b873aa687bff3f0e94b 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -1,7 +1,7 @@
 config DVB_FE_CUSTOMISE
        bool "Customise the frontend modules to build"
        depends on DVB_CORE
-       default y if EMBEDDED
+       default y if EXPERT
        help
          This allows the user to select/deselect frontend drivers for their
          hardware from the build.
@@ -497,7 +497,7 @@ comment "ISDB-T (terrestrial) frontends"
        depends on DVB_CORE
 
 config DVB_S921
-       tristate "Sharp S921 tuner"
+       tristate "Sharp S921 frontend"
        depends on DVB_CORE && I2C
        default m if DVB_FE_CUSTOMISE
        help
@@ -512,6 +512,14 @@ config DVB_DIB8000
          A driver for DiBcom's DiB8000 ISDB-T/ISDB-Tsb demodulator.
          Say Y when you want to support this frontend.
 
+config DVB_MB86A20S
+       tristate "Fujitsu mb86a20s"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         A driver for Fujitsu mb86a20s ISDB-T/ISDB-Tsb demodulator.
+         Say Y when you want to support this frontend.
+
 comment "Digital terrestrial only tuners/PLL"
        depends on DVB_CORE