Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[pandora-kernel.git] / drivers / media / common / tuners / Kconfig

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 394cb05..850d568 100644 (file)
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -1,6 +1,6 @@
 config MEDIA_ATTACH
        bool "Load and attach frontend and tuner driver modules as needed"
-       depends on DVB_CORE
+       depends on VIDEO_MEDIA
        depends on MODULES
        help
          Remove the static dependency of DVB card drivers on all
@@ -21,8 +21,9 @@ config MEDIA_TUNER
        tristate
        default VIDEO_MEDIA && I2C
        depends on VIDEO_MEDIA && I2C
+       select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
-       select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
        select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
        select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
@@ -33,6 +34,7 @@ config MEDIA_TUNER
 menuconfig MEDIA_TUNER_CUSTOMIZE
        bool "Customize analog and hybrid tuner modules to build"
        depends on MEDIA_TUNER
+       default n
        help
          This allows the user to deselect tuner drivers unnecessary
          for their hardware from the build. Use this option with care
@@ -46,6 +48,7 @@ if MEDIA_TUNER_CUSTOMIZE
 
 config MEDIA_TUNER_SIMPLE
        tristate "Simple tuner support"
+       depends on VIDEO_MEDIA && I2C
        select MEDIA_TUNER_TDA9887
        default m if MEDIA_TUNER_CUSTOMIZE
        help
@@ -53,6 +56,7 @@ config MEDIA_TUNER_SIMPLE
 
 config MEDIA_TUNER_TDA8290
        tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"
+       depends on VIDEO_MEDIA && I2C
        select MEDIA_TUNER_TDA827X
        select MEDIA_TUNER_TDA18271
        default m if MEDIA_TUNER_CUSTOMIZE
@@ -61,18 +65,21 @@ config MEDIA_TUNER_TDA8290
 
 config MEDIA_TUNER_TDA827X
        tristate "Philips TDA827X silicon tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A DVB-T silicon tuner module. Say Y when you want to support this tuner.
 
 config MEDIA_TUNER_TDA18271
        tristate "NXP TDA18271 silicon tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A silicon tuner module. Say Y when you want to support this tuner.
 
 config MEDIA_TUNER_TDA9887
        tristate "TDA 9885/6/7 analog IF demodulator"
+       depends on VIDEO_MEDIA && I2C
        default m if MEDIA_TUNER_CUSTOMIZE
        help
          Say Y here to include support for Philips TDA9885/6/7
@@ -80,6 +87,7 @@ config MEDIA_TUNER_TDA9887
 
 config MEDIA_TUNER_TEA5761
        tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
+       depends on VIDEO_MEDIA && I2C
        depends on EXPERIMENTAL
        default m if MEDIA_TUNER_CUSTOMIZE
        help
@@ -87,42 +95,49 @@ config MEDIA_TUNER_TEA5761
 
 config MEDIA_TUNER_TEA5767
        tristate "TEA 5767 radio tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if MEDIA_TUNER_CUSTOMIZE
        help
          Say Y here to include support for the Philips TEA5767 radio tuner.
 
 config MEDIA_TUNER_MT20XX
        tristate "Microtune 2032 / 2050 tuners"
+       depends on VIDEO_MEDIA && I2C
        default m if MEDIA_TUNER_CUSTOMIZE
        help
          Say Y here to include support for the MT2032 / MT2050 tuner.
 
 config MEDIA_TUNER_MT2060
        tristate "Microtune MT2060 silicon IF tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A driver for the silicon IF tuner MT2060 from Microtune.
 
 config MEDIA_TUNER_MT2266
        tristate "Microtune MT2266 silicon tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A driver for the silicon baseband tuner MT2266 from Microtune.
 
 config MEDIA_TUNER_MT2131
        tristate "Microtune MT2131 silicon tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A driver for the silicon baseband tuner MT2131 from Microtune.
 
 config MEDIA_TUNER_QT1010
        tristate "Quantek QT1010 silicon tuner"
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A driver for the silicon tuner QT1010 from Quantek.
 
 config MEDIA_TUNER_XC2028
        tristate "XCeive xc2028/xc3028 tuners"
+       depends on VIDEO_MEDIA && I2C
        depends on HOTPLUG
        select FW_LOADER
        default m if MEDIA_TUNER_CUSTOMIZE
@@ -131,6 +146,7 @@ config MEDIA_TUNER_XC2028
 
 config MEDIA_TUNER_XC5000
        tristate "Xceive XC5000 silicon tuner"
+       depends on VIDEO_MEDIA && I2C
        depends on HOTPLUG
        select FW_LOADER
        default m if DVB_FE_CUSTOMISE
@@ -141,7 +157,7 @@ config MEDIA_TUNER_XC5000
 
 config MEDIA_TUNER_MXL5005S
        tristate "MaxLinear MSL5005S silicon tuner"
-       depends on I2C
+       depends on VIDEO_MEDIA && I2C
        default m if DVB_FE_CUSTOMISE
        help
          A driver for the silicon tuner MXL5005S from MaxLinear.