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

[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 f9a9273028a9f2b092522bddf39ae204ebf3791d..a486a7f81fa9c226594e3ef0d879345ddbca4a31 100644 (file)
--- a/drivers/media/dvb/frontends/Kconfig
+++ b/drivers/media/dvb/frontends/Kconfig
@@ -313,6 +313,13 @@ config DVB_TDA10048
        help
          A DVB-T tuner module. Say Y when you want to support this frontend.
 
+config DVB_AF9013
+       tristate "Afatech AF9013 demodulator"
+       depends on DVB_CORE && I2C
+       default m if DVB_FE_CUSTOMISE
+       help
+         Say Y when you want to support this frontend.
+
 comment "DVB-C (cable) frontends"
        depends on DVB_CORE
 
@@ -412,6 +419,14 @@ config DVB_LGDT3304
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
          to support this frontend.
 
+config DVB_LGDT3305
+       tristate "LG Electronics LGDT3305 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.
+
 config DVB_S5H1409
        tristate "Samsung S5H1409 based"
        depends on DVB_CORE && I2C
@@ -422,7 +437,7 @@ config DVB_S5H1409
 
 config DVB_AU8522
        tristate "Auvitek AU8522 based"
-       depends on DVB_CORE && I2C
+       depends on DVB_CORE && I2C && VIDEO_V4L2
        default m if DVB_FE_CUSTOMISE
        help
          An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
@@ -464,7 +479,7 @@ config DVB_TUNER_DIB0070
        default m if DVB_FE_CUSTOMISE
        help
          A driver for the silicon baseband tuner DiB0070 from DiBcom.
-         This device is only used inside a SiP called togther with a
+         This device is only used inside a SiP called together with a
          demodulator for now.
 
 comment "SEC control devices for DVB-S"
@@ -503,13 +518,6 @@ comment "Tools to develop new frontends"
 config DVB_DUMMY_FE
        tristate "Dummy frontend driver"
        default n
-
-config DVB_AF9013
-       tristate "Afatech AF9013 demodulator"
-       depends on DVB_CORE && I2C
-       default m if DVB_FE_CUSTOMISE
-       help
-         Say Y when you want to support this frontend.
 endmenu
 
 endif