Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

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

diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
index 68fab616f55dfa483d62f3d69cb3ad4c6f4ac5ad..f5fceb3cdb3cb0d71b34e7fa8a1bc272cc04f65e 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -307,6 +307,14 @@ config DVB_AU8522
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
          to support this frontend.
 
+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 "Tuners/PLL support"
        depends on DVB_CORE