11 files changed, 74 insertions, 74 deletions

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index 724e6870c412..52c3f65b12d6 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -21,17 +21,17 @@ config MEDIA_TUNER
         tristate
         default VIDEO_MEDIA && I2C
         depends on VIDEO_MEDIA && I2C
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TEA5767 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMIZE
-
-menuconfig MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TEA5767 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE
+
+menuconfig MEDIA_TUNER_CUSTOMISE
         bool "Customize analog and hybrid tuner modules to build"
         depends on MEDIA_TUNER
         default n
@@ -44,13 +44,13 @@ menuconfig MEDIA_TUNER_CUSTOMIZE
 
           If unsure say N.
 
-if MEDIA_TUNER_CUSTOMIZE
+if MEDIA_TUNER_CUSTOMISE
 
 config MEDIA_TUNER_SIMPLE
         tristate "Simple tuner support"
         depends on VIDEO_MEDIA && I2C
         select MEDIA_TUNER_TDA9887
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to include support for various simple tuners.
 
@@ -59,28 +59,28 @@ config MEDIA_TUNER_TDA8290
         depends on VIDEO_MEDIA && I2C
         select MEDIA_TUNER_TDA827X
         select MEDIA_TUNER_TDA18271
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to include support for Philips TDA8290+8275(a) tuner.
 
 config MEDIA_TUNER_TDA827X
         tristate "Philips TDA827X silicon tuner"
         depends on VIDEO_MEDIA && I2C
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_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
+        default m if MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to include support for Philips TDA9885/6/7
           analog IF demodulator.
@@ -89,63 +89,63 @@ config MEDIA_TUNER_TEA5761
         tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
         depends on VIDEO_MEDIA && I2C
         depends on EXPERIMENTAL
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to include support for the Philips TEA5761 radio tuner.
 
 config MEDIA_TUNER_TEA5767
         tristate "TEA 5767 radio tuner"
         depends on VIDEO_MEDIA && I2C
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         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
+        default m if MEDIA_TUNER_CUSTOMISE
         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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_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
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
 
 config MEDIA_TUNER_XC5000
         tristate "Xceive XC5000 silicon tuner"
         depends on VIDEO_MEDIA && I2C
-        default m if MEDIA_TUNER_CUSTOMIZE
+        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
@@ -154,22 +154,22 @@ config MEDIA_TUNER_XC5000
 config MEDIA_TUNER_MXL5005S
         tristate "MaxLinear MSL5005S silicon tuner"
         depends on VIDEO_MEDIA && I2C
-        default m if MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         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 MEDIA_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Freescale MC44S803 based tuners
 
-endif # MEDIA_TUNER_CUSTOMIZE
+endif # MEDIA_TUNER_CUSTOMISE
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index a8c6249c4099..9e5781400744 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -13,7 +13,7 @@ config DVB_B2C2_FLEXCOP
         select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
         select DVB_CX24123 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
         select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
         help
           Support for the digital TV receiver chip made by B2C2 Inc. included in
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index 27edb0ece587..8668e634c7ec 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -8,7 +8,7 @@ config DVB_BT8XX
         select DVB_OR51211 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
           the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index b899d509adf6..5b0c8cc25fdf 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -25,7 +25,7 @@ config DVB_USB_A800
         depends on DVB_USB
         select DVB_DIB3000MC
         select DVB_PLL if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
 
@@ -34,7 +34,7 @@ config DVB_USB_DIBUSB_MB
         depends on DVB_USB
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MB
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
         help
           Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
           DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
@@ -55,7 +55,7 @@ config DVB_USB_DIBUSB_MC
         tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)"
         depends on DVB_USB
         select DVB_DIB3000MC
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
         help
           Support for USB2.0 DVB-T receivers based on reference designs made by
           DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
@@ -75,11 +75,11 @@ config DVB_USB_DIB0700
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE
         help
           Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
           USB bridge is also present in devices having the DiB7700 DVB-T-USB
@@ -97,7 +97,7 @@ config DVB_USB_UMT_010
         depends on DVB_USB
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MC
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
@@ -113,9 +113,9 @@ config DVB_USB_CXUSB
         select DVB_DIB7000P if !DVB_FE_CUSTOMISE
         select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Conexant USB2.0 hybrid reference design.
           Currently, only DVB and ATSC modes are supported, analog mode
@@ -129,8 +129,8 @@ config DVB_USB_M920X
         depends on DVB_USB
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver.
           Currently, only devices with a product id of
@@ -141,7 +141,7 @@ config DVB_USB_GL861
         tristate "Genesys Logic GL861 USB2.0 support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
           receiver with USB ID 0db0:5581.
@@ -150,7 +150,7 @@ config DVB_USB_AU6610
         tristate "Alcor Micro AU6610 USB2.0 support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
 
@@ -203,7 +203,7 @@ config DVB_USB_NOVA_T_USB2
         depends on DVB_USB
         select DVB_DIB3000MC
         select DVB_PLL if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
 
@@ -239,8 +239,8 @@ config DVB_USB_OPERA1
 config DVB_USB_AF9005
         tristate "Afatech AF9005 DVB-T USB1.1 support"
         depends on DVB_USB && EXPERIMENTAL
-        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver
           and the TerraTec Cinergy T USB XE (Rev.1)
@@ -288,7 +288,7 @@ config DVB_USB_DTV5100
         tristate "AME DTV-5100 USB2.0 DVB-T support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver.
 
@@ -297,10 +297,10 @@ config DVB_USB_AF9015
         depends on DVB_USB && EXPERIMENTAL
         select DVB_AF9013
         select DVB_PLL              if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_MT2060   if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_QT1010   if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MT2060   if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_QT1010   if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
         select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE
         help
           Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index ab0bcd208c78..772990415f99 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -108,7 +108,7 @@ config DVB_BUDGET_CI
         select DVB_STB6100 if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
         select DVB_TDA10023 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
         select VIDEO_IR
         help
           Support for simple SAA7146 based DVB cards
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index 551f9ba63876..05cdf494dfb0 100644
--- 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 !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
         ---help---
           This is a video4linux driver for Auvitek's USB device.
 
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index 8940b5387dec..e8a50a611ebc 100644
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -9,7 +9,7 @@ config VIDEO_CX18
         select VIDEO_CX2341X
         select VIDEO_CS5345
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
         ---help---
           This is a video4linux driver for Conexant cx23418 based
           PCI combo video recorder devices.
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index e603ceb2811b..fd3fc3e3198a 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -19,11 +19,11 @@ config VIDEO_CX23885
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
         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 !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
+        select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
         ---help---
           This is a video4linux driver for Conexant 23885 based
           TV cards.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 2d250a2a7bc3..49952980dab3 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -61,7 +61,7 @@ config VIDEO_CX88_DVB
         select DVB_STV0299 if !DVB_FE_CUSTOMISE
         select DVB_STV0288 if !DVB_FE_CUSTOMISE
         select DVB_STB6000 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
         ---help---
           This adds support for DVB/ATSC cards based on the
           Conexant 2388x chip.
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 17cde17571c7..f9b6001e1dd7 100644
--- 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 !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMISE
         ---help---
 
           This option enables a DVB interface for the pvrusb2 driver.
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index e62b2996768f..a2089acb0309 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -36,15 +36,15 @@ config VIDEO_SAA7134_DVB
         select DVB_TDA826X if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
         select DVB_ISL6405 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
         select DVB_ZL10036 if !DVB_FE_CUSTOMISE
         select DVB_MT312 if !DVB_FE_CUSTOMISE
         select DVB_LNBP21 if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
-        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
-        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMISE
         ---help---
           This adds support for DVB cards based on the
           Philips saa7134 chip.