1 files changed, 39 insertions, 39 deletions

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index e6926e9fa332..7b379e1ce01b 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -1,4 +1,4 @@
-config DVB_CORE_ATTACH
+config MEDIA_ATTACH
         bool "Load and attach frontend driver modules as needed"
         depends on DVB_CORE
         depends on MODULES
@@ -12,22 +12,22 @@ config DVB_CORE_ATTACH
 
           If unsure say Y.
 
-config VIDEO_TUNER
+config MEDIA_TUNER
         tristate
         default DVB_CORE || VIDEO_DEV
         depends on DVB_CORE || VIDEO_DEV
-        select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE
-        select DVB_TUNER_XC5000 if !VIDEO_TUNER_CUSTOMIZE
-        select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE
-        select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE
-        select TUNER_TEA5761 if !VIDEO_TUNER_CUSTOMIZE
-        select TUNER_TEA5767 if !VIDEO_TUNER_CUSTOMIZE
-        select TUNER_SIMPLE if !VIDEO_TUNER_CUSTOMIZE
-        select TUNER_TDA9887 if !VIDEO_TUNER_CUSTOMIZE
-
-menuconfig VIDEO_TUNER_CUSTOMIZE
+        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
+
+menuconfig MEDIA_TUNER_CUSTOMIZE
         bool "Customize analog and hybrid tuner modules to build"
-        depends on VIDEO_TUNER
+        depends on MEDIA_TUNER
         help
           This allows the user to deselect tuner drivers unnecessary
           for their hardware from the build. Use this option with care
@@ -37,104 +37,104 @@ menuconfig VIDEO_TUNER_CUSTOMIZE
 
           If unsure say N.
 
-if VIDEO_TUNER_CUSTOMIZE
+if MEDIA_TUNER_CUSTOMIZE
 
-config TUNER_SIMPLE
+config MEDIA_TUNER_SIMPLE
         tristate "Simple tuner support"
         depends on I2C
-        select TUNER_TDA9887
-        default m if VIDEO_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_TDA9887
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for various simple tuners.
 
-config TUNER_TDA8290
+config MEDIA_TUNER_TDA8290
         tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo"
         depends on I2C
-        select DVB_TDA827X
-        select DVB_TDA18271
-        default m if VIDEO_TUNER_CUSTOMIZE
+        select MEDIA_TUNER_TDA827X
+        select MEDIA_TUNER_TDA18271
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for Philips TDA8290+8275(a) tuner.
 
-config DVB_TDA827X
+config MEDIA_TUNER_TDA827X
         tristate "Philips TDA827X silicon tuner"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A DVB-T silicon tuner module. Say Y when you want to support this tuner.
 
-config DVB_TDA18271
+config MEDIA_TUNER_TDA18271
         tristate "NXP TDA18271 silicon tuner"
         depends on I2C
         default m if DVB_FE_CUSTOMISE
         help
           A silicon tuner module. Say Y when you want to support this tuner.
 
-config TUNER_TDA9887
+config MEDIA_TUNER_TDA9887
         tristate "TDA 9885/6/7 analog IF demodulator"
         depends on I2C
-        default m if VIDEO_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for Philips TDA9885/6/7
           analog IF demodulator.
 
-config TUNER_TEA5761
+config MEDIA_TUNER_TEA5761
         tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
         depends on I2C && EXPERIMENTAL
-        default m if VIDEO_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the Philips TEA5761 radio tuner.
 
-config TUNER_TEA5767
+config MEDIA_TUNER_TEA5767
         tristate "TEA 5767 radio tuner"
         depends on I2C
-        default m if VIDEO_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the Philips TEA5767 radio tuner.
 
-config TUNER_MT20XX
+config MEDIA_TUNER_MT20XX
         tristate "Microtune 2032 / 2050 tuners"
         depends on I2C
-        default m if VIDEO_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the MT2032 / MT2050 tuner.
 
-config DVB_TUNER_MT2060
+config MEDIA_TUNER_MT2060
         tristate "Microtune MT2060 silicon IF tuner"
         depends on I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon IF tuner MT2060 from Microtune.
 
-config DVB_TUNER_MT2266
+config MEDIA_TUNER_MT2266
         tristate "Microtune MT2266 silicon tuner"
         depends on I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon baseband tuner MT2266 from Microtune.
 
-config DVB_TUNER_MT2131
+config MEDIA_TUNER_MT2131
         tristate "Microtune MT2131 silicon tuner"
         depends on I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon baseband tuner MT2131 from Microtune.
 
-config DVB_TUNER_QT1010
+config MEDIA_TUNER_QT1010
         tristate "Quantek QT1010 silicon tuner"
         depends on DVB_CORE && I2C
         default m if DVB_FE_CUSTOMISE
         help
           A driver for the silicon tuner QT1010 from Quantek.
 
-config TUNER_XC2028
+config MEDIA_TUNER_XC2028
         tristate "XCeive xc2028/xc3028 tuners"
         depends on I2C && FW_LOADER
-        default m if VIDEO_TUNER_CUSTOMIZE
+        default m if MEDIA_TUNER_CUSTOMIZE
         help
           Say Y here to include support for the xc2028/xc3028 tuners.
 
-config DVB_TUNER_XC5000
+config MEDIA_TUNER_XC5000
         tristate "Xceive XC5000 silicon tuner"
         depends on I2C
         default m if DVB_FE_CUSTOMISE
@@ -143,4 +143,4 @@ config DVB_TUNER_XC5000
           This device is only used inside a SiP called togther with a
           demodulator for now.
 
-endif # VIDEO_TUNER_CUSTOMIZE
+endif # MEDIA_TUNER_CUSTOMIZE