Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[mv-sheeva.git] / drivers / media / common / tuners / Kconfig

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 52c3f65b12d69362b79c8b386cf0d59c3e04bb02..409a4261e5b5fa1c89f63e668499c1b7b5e1cdc8 100644 (file)
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -148,7 +148,7 @@ config MEDIA_TUNER_XC5000
        default m if MEDIA_TUNER_CUSTOMISE
        help
          A driver for the silicon tuner XC5000 from Xceive.
-         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.
 
 config MEDIA_TUNER_MXL5005S
@@ -172,4 +172,11 @@ config MEDIA_TUNER_MC44S803
        help
          Say Y here to support the Freescale MC44S803 based tuners
 
+config MEDIA_TUNER_MAX2165
+       tristate "Maxim MAX2165 silicon tuner"
+       depends on VIDEO_MEDIA && I2C
+       default m if MEDIA_TUNER_CUSTOMISE
+       help
+         A driver for the silicon tuner MAX2165 from Maxim.
+
 endif # MEDIA_TUNER_CUSTOMISE