V4L/DVB (10897): Fix Kbuild MEDIA_TUNER_CUSTOMIZE dependencies

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 7969b695cb509711d8b7242a05a52c6bbb2a77f3..724e6870c412090aad7a792d5f5dfd915a05960e 100644 (file)
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -66,14 +66,14 @@ config MEDIA_TUNER_TDA8290
 config MEDIA_TUNER_TDA827X
        tristate "Philips TDA827X silicon tuner"
        depends on VIDEO_MEDIA && I2C
-       default m if DVB_FE_CUSTOMISE
+       default m if MEDIA_TUNER_CUSTOMIZE
        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
+       default m if MEDIA_TUNER_CUSTOMIZE
        help
          A silicon tuner module. Say Y when you want to support this tuner.
 
@@ -110,28 +110,28 @@ config MEDIA_TUNER_MT20XX
 config MEDIA_TUNER_MT2060
        tristate "Microtune MT2060 silicon IF tuner"
        depends on VIDEO_MEDIA && I2C
-       default m if DVB_FE_CUSTOMISE
+       default m if MEDIA_TUNER_CUSTOMIZE
        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
+       default m if MEDIA_TUNER_CUSTOMIZE
        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
+       default m if MEDIA_TUNER_CUSTOMIZE
        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
+       default m if MEDIA_TUNER_CUSTOMIZE
        help
          A driver for the silicon tuner QT1010 from Quantek.
 
@@ -145,7 +145,7 @@ config MEDIA_TUNER_XC2028
 config MEDIA_TUNER_XC5000
        tristate "Xceive XC5000 silicon tuner"
        depends on VIDEO_MEDIA && I2C
-       default m if DVB_FE_CUSTOMISE
+       default m if MEDIA_TUNER_CUSTOMIZE
        help
          A driver for the silicon tuner XC5000 from Xceive.
          This device is only used inside a SiP called togther with a
@@ -154,21 +154,21 @@ config MEDIA_TUNER_XC5000
 config MEDIA_TUNER_MXL5005S
        tristate "MaxLinear MSL5005S silicon tuner"
        depends on VIDEO_MEDIA && I2C
-       default m if DVB_FE_CUSTOMISE
+       default m if MEDIA_TUNER_CUSTOMIZE
        help
          A driver for the silicon tuner MXL5005S from MaxLinear.
 
 config MEDIA_TUNER_MXL5007T
        tristate "MaxLinear MxL5007T silicon tuner"
        depends on VIDEO_MEDIA && I2C
-       default m if DVB_FE_CUSTOMISE
+       default m if MEDIA_TUNER_CUSTOMIZE
        help
          A driver for the silicon tuner MxL5007T from MaxLinear.
 
 config MEDIA_TUNER_MC44S803
        tristate "Freescale MC44S803 Low Power CMOS Broadband tuners"
        depends on VIDEO_MEDIA && I2C
-       default m if DVB_FE_CUSTOMISE
+       default m if MEDIA_TUNER_CUSTOMIZE
        help
          Say Y here to support the Freescale MC44S803 based tuners
 

diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index deb00e4acb949e8791e93824b005d68f5e266abd..20993ae17d36d9279be8ae157cf4a6377adca7a6 100644 (file)
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -5,9 +5,9 @@ config VIDEO_AU0828
        select I2C_ALGOBIT
        select VIDEO_TVEEPROM
        select DVB_AU8522 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
        ---help---
          This is a video4linux driver for Auvitek's USB device.
 

diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index 28896aa31506038a59373d20c4edf6f95886eb29..e603ceb2811b46f125a821220d1c4bb57cea7dd7 100644 (file)
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -20,10 +20,10 @@ config VIDEO_CX23885
        select DVB_STV6110 if !DVB_FE_CUSTOMISE
        select DVB_STV0900 if !DVB_FE_CUSTOMISE
        select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE
-       select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
+       select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
        ---help---
          This is a video4linux driver for Conexant 23885 based
          TV cards.

diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index bb42713939ee204c3c1ab79516e0227512200899..17cde17571c783000ab36e5ed7b44a18e3ae716b 100644 (file)
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -41,9 +41,9 @@ config VIDEO_PVRUSB2_DVB
        select DVB_S5H1409 if !DVB_FE_CUSTOMISE
        select DVB_S5H1411 if !DVB_FE_CUSTOMISE
        select DVB_TDA10048 if !DVB_FE_CUSTOMISE
-       select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
-       select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
        ---help---
 
          This option enables a DVB interface for the pvrusb2 driver.