35 files changed, 117 insertions, 117 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
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile
index 812864312628..236d9932fd92 100644
--- a/drivers/media/common/tuners/Makefile
+++ b/drivers/media/common/tuners/Makefile
@@ -4,22 +4,22 @@
 
 tda18271-objs := tda18271-maps.o tda18271-common.o tda18271-fe.o
 
-obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o
-obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o
+obj-$(CONFIG_MEDIA_TUNER_XC2028) += tuner-xc2028.o
+obj-$(CONFIG_MEDIA_TUNER_SIMPLE) += tuner-simple.o
 # tuner-types will be merged into tuner-simple, in the future
-obj-$(CONFIG_TUNER_SIMPLE) += tuner-types.o
-obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o
-obj-$(CONFIG_TUNER_TDA8290) += tda8290.o
-obj-$(CONFIG_TUNER_TEA5767) += tea5767.o
-obj-$(CONFIG_TUNER_TEA5761) += tea5761.o
-obj-$(CONFIG_TUNER_TDA9887) += tda9887.o
-obj-$(CONFIG_DVB_TDA827X) += tda827x.o
-obj-$(CONFIG_DVB_TDA18271) += tda18271.o
-obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o
-obj-$(CONFIG_DVB_TUNER_MT2060) += mt2060.o
-obj-$(CONFIG_DVB_TUNER_MT2266) += mt2266.o
-obj-$(CONFIG_DVB_TUNER_QT1010) += qt1010.o
-obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o
+obj-$(CONFIG_MEDIA_TUNER_SIMPLE) += tuner-types.o
+obj-$(CONFIG_MEDIA_TUNER_MT20XX) += mt20xx.o
+obj-$(CONFIG_MEDIA_TUNER_TDA8290) += tda8290.o
+obj-$(CONFIG_MEDIA_TUNER_TEA5767) += tea5767.o
+obj-$(CONFIG_MEDIA_TUNER_TEA5761) += tea5761.o
+obj-$(CONFIG_MEDIA_TUNER_TDA9887) += tda9887.o
+obj-$(CONFIG_MEDIA_TUNER_TDA827X) += tda827x.o
+obj-$(CONFIG_MEDIA_TUNER_TDA18271) += tda18271.o
+obj-$(CONFIG_MEDIA_TUNER_XC5000) += xc5000.o
+obj-$(CONFIG_MEDIA_TUNER_MT2060) += mt2060.o
+obj-$(CONFIG_MEDIA_TUNER_MT2266) += mt2266.o
+obj-$(CONFIG_MEDIA_TUNER_QT1010) += qt1010.o
+obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt2131.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/common/tuners/mt2060.h b/drivers/media/common/tuners/mt2060.h
index acba0058f519..cb60caffb6b6 100644
--- a/drivers/media/common/tuners/mt2060.h
+++ b/drivers/media/common/tuners/mt2060.h
@@ -30,7 +30,7 @@ struct mt2060_config {
         u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */
 };
 
-#if defined(CONFIG_DVB_TUNER_MT2060) || (defined(CONFIG_DVB_TUNER_MT2060_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_MT2060) || (defined(CONFIG_MEDIA_TUNER_MT2060_MODULE) && defined(MODULE))
 extern struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1);
 #else
 static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2060_config *cfg, u16 if1)
@@ -38,6 +38,6 @@ static inline struct dvb_frontend * mt2060_attach(struct dvb_frontend *fe, struc
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif // CONFIG_DVB_TUNER_MT2060
+#endif // CONFIG_MEDIA_TUNER_MT2060
 
 #endif
diff --git a/drivers/media/common/tuners/mt20xx.h b/drivers/media/common/tuners/mt20xx.h
index aa848e14ce5e..259553a24903 100644
--- a/drivers/media/common/tuners/mt20xx.h
+++ b/drivers/media/common/tuners/mt20xx.h
@@ -20,7 +20,7 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
-#if defined(CONFIG_TUNER_MT20XX) || (defined(CONFIG_TUNER_MT20XX_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_MT20XX) || (defined(CONFIG_MEDIA_TUNER_MT20XX_MODULE) && defined(MODULE))
 extern struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
                                              struct i2c_adapter* i2c_adap,
                                              u8 i2c_addr);
diff --git a/drivers/media/common/tuners/mt2131.h b/drivers/media/common/tuners/mt2131.h
index 606d8576bc98..cd8376f6f7b4 100644
--- a/drivers/media/common/tuners/mt2131.h
+++ b/drivers/media/common/tuners/mt2131.h
@@ -30,7 +30,7 @@ struct mt2131_config {
         u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */
 };
 
-#if defined(CONFIG_DVB_TUNER_MT2131) || (defined(CONFIG_DVB_TUNER_MT2131_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_MT2131) || (defined(CONFIG_MEDIA_TUNER_MT2131_MODULE) && defined(MODULE))
 extern struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
                                           struct mt2131_config *cfg,
@@ -44,7 +44,7 @@ static inline struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe,
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif /* CONFIG_DVB_TUNER_MT2131 */
+#endif /* CONFIG_MEDIA_TUNER_MT2131 */
 
 #endif /* __MT2131_H__ */
 
diff --git a/drivers/media/common/tuners/mt2266.h b/drivers/media/common/tuners/mt2266.h
index c5113efe333c..4d083882d044 100644
--- a/drivers/media/common/tuners/mt2266.h
+++ b/drivers/media/common/tuners/mt2266.h
@@ -24,7 +24,7 @@ struct mt2266_config {
         u8 i2c_address;
 };
 
-#if defined(CONFIG_DVB_TUNER_MT2266) || (defined(CONFIG_DVB_TUNER_MT2266_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_MT2266) || (defined(CONFIG_MEDIA_TUNER_MT2266_MODULE) && defined(MODULE))
 extern struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg);
 #else
 static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct mt2266_config *cfg)
@@ -32,6 +32,6 @@ static inline struct dvb_frontend * mt2266_attach(struct dvb_frontend *fe, struc
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif // CONFIG_DVB_TUNER_MT2266
+#endif // CONFIG_MEDIA_TUNER_MT2266
 
 #endif
diff --git a/drivers/media/common/tuners/qt1010.h b/drivers/media/common/tuners/qt1010.h
index cff6a7ca5380..807fb7b6146b 100644
--- a/drivers/media/common/tuners/qt1010.h
+++ b/drivers/media/common/tuners/qt1010.h
@@ -36,7 +36,7 @@ struct qt1010_config {
  * @param cfg  tuner hw based configuration
  * @return fe  pointer on success, NULL on failure
  */
-#if defined(CONFIG_DVB_TUNER_QT1010) || (defined(CONFIG_DVB_TUNER_QT1010_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_QT1010) || (defined(CONFIG_MEDIA_TUNER_QT1010_MODULE) && defined(MODULE))
 extern struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
                                           struct qt1010_config *cfg);
@@ -48,6 +48,6 @@ static inline struct dvb_frontend *qt1010_attach(struct dvb_frontend *fe,
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif // CONFIG_DVB_TUNER_QT1010
+#endif // CONFIG_MEDIA_TUNER_QT1010
 
 #endif
diff --git a/drivers/media/common/tuners/tda18271.h b/drivers/media/common/tuners/tda18271.h
index 0e7af8d05a38..7db9831c0cb0 100644
--- a/drivers/media/common/tuners/tda18271.h
+++ b/drivers/media/common/tuners/tda18271.h
@@ -81,7 +81,7 @@ struct tda18271_config {
         unsigned int small_i2c:1;
 };
 
-#if defined(CONFIG_DVB_TDA18271) || (defined(CONFIG_DVB_TDA18271_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TDA18271) || (defined(CONFIG_MEDIA_TUNER_TDA18271_MODULE) && defined(MODULE))
 extern struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                                             struct i2c_adapter *i2c,
                                             struct tda18271_config *cfg);
diff --git a/drivers/media/common/tuners/tda827x.h b/drivers/media/common/tuners/tda827x.h
index b73c23570dab..7850a9a1dc8f 100644
--- a/drivers/media/common/tuners/tda827x.h
+++ b/drivers/media/common/tuners/tda827x.h
@@ -51,7 +51,7 @@ struct tda827x_config
  * @param cfg optional callback function pointers.
  * @return FE pointer on success, NULL on failure.
  */
-#if defined(CONFIG_DVB_TDA827X) || (defined(CONFIG_DVB_TDA827X_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TDA827X) || (defined(CONFIG_MEDIA_TUNER_TDA827X_MODULE) && defined(MODULE))
 extern struct dvb_frontend* tda827x_attach(struct dvb_frontend *fe, int addr,
                                            struct i2c_adapter *i2c,
                                            struct tda827x_config *cfg);
@@ -64,6 +64,6 @@ static inline struct dvb_frontend* tda827x_attach(struct dvb_frontend *fe,
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif // CONFIG_DVB_TDA827X
+#endif // CONFIG_MEDIA_TUNER_TDA827X
 
 #endif // __DVB_TDA827X_H__
diff --git a/drivers/media/common/tuners/tda8290.h b/drivers/media/common/tuners/tda8290.h
index d3bbf276a469..aa074f3f0c07 100644
--- a/drivers/media/common/tuners/tda8290.h
+++ b/drivers/media/common/tuners/tda8290.h
@@ -29,7 +29,7 @@ struct tda829x_config {
 #define TDA829X_DONT_PROBE  1
 };
 
-#if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TDA8290) || (defined(CONFIG_MEDIA_TUNER_TDA8290_MODULE) && defined(MODULE))
 extern int tda829x_probe(struct i2c_adapter *i2c_adap, u8 i2c_addr);
 
 extern struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
diff --git a/drivers/media/common/tuners/tda9887.h b/drivers/media/common/tuners/tda9887.h
index be49dcbfc70e..acc419e8c4fc 100644
--- a/drivers/media/common/tuners/tda9887.h
+++ b/drivers/media/common/tuners/tda9887.h
@@ -21,7 +21,7 @@
 #include "dvb_frontend.h"
 
 /* ------------------------------------------------------------------------ */
-#if defined(CONFIG_TUNER_TDA9887) || (defined(CONFIG_TUNER_TDA9887_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TDA9887) || (defined(CONFIG_MEDIA_TUNER_TDA9887_MODULE) && defined(MODULE))
 extern struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
                                            struct i2c_adapter *i2c_adap,
                                            u8 i2c_addr);
diff --git a/drivers/media/common/tuners/tea5761.h b/drivers/media/common/tuners/tea5761.h
index 8eb62722b988..2e2ff82c95a4 100644
--- a/drivers/media/common/tuners/tea5761.h
+++ b/drivers/media/common/tuners/tea5761.h
@@ -20,7 +20,7 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
-#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TEA5761) || (defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) && defined(MODULE))
 extern int tea5761_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr);
 
 extern struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
diff --git a/drivers/media/common/tuners/tea5767.h b/drivers/media/common/tuners/tea5767.h
index 7b547c092e25..d30ab1b483de 100644
--- a/drivers/media/common/tuners/tea5767.h
+++ b/drivers/media/common/tuners/tea5767.h
@@ -39,7 +39,7 @@ struct tea5767_ctrl {
         enum tea5767_xtal       xtal_freq;
 };
 
-#if defined(CONFIG_TUNER_TEA5767) || (defined(CONFIG_TUNER_TEA5767_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TEA5767) || (defined(CONFIG_MEDIA_TUNER_TEA5767_MODULE) && defined(MODULE))
 extern int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr);
 
 extern struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
diff --git a/drivers/media/common/tuners/tuner-simple.h b/drivers/media/common/tuners/tuner-simple.h
index e46cf0121e03..381fa5d35a9b 100644
--- a/drivers/media/common/tuners/tuner-simple.h
+++ b/drivers/media/common/tuners/tuner-simple.h
@@ -20,7 +20,7 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
-#if defined(CONFIG_TUNER_SIMPLE) || (defined(CONFIG_TUNER_SIMPLE_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_SIMPLE) || (defined(CONFIG_MEDIA_TUNER_SIMPLE_MODULE) && defined(MODULE))
 extern struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
                                                 struct i2c_adapter *i2c_adap,
                                                 u8 i2c_addr,
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h
index fc2f132a5541..216025cf5d4b 100644
--- a/drivers/media/common/tuners/tuner-xc2028.h
+++ b/drivers/media/common/tuners/tuner-xc2028.h
@@ -47,7 +47,7 @@ struct xc2028_config {
 #define XC2028_TUNER_RESET      0
 #define XC2028_RESET_CLK        1
 
-#if defined(CONFIG_TUNER_XC2028) || (defined(CONFIG_TUNER_XC2028_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_XC2028) || (defined(CONFIG_MEDIA_TUNER_XC2028_MODULE) && defined(MODULE))
 extern struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                                           struct xc2028_config *cfg);
 #else
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index b890883a0cdc..0ee80f9d19b8 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -45,8 +45,8 @@ struct xc5000_config {
 /* xc5000 callback command */
 #define XC5000_TUNER_RESET              0
 
-#if defined(CONFIG_DVB_TUNER_XC5000) || \
-    (defined(CONFIG_DVB_TUNER_XC5000_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_XC5000) || \
+    (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE))
 extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
                                           struct i2c_adapter *i2c,
                                           struct xc5000_config *cfg);
@@ -58,6 +58,6 @@ static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
-#endif // CONFIG_DVB_TUNER_XC5000
+#endif // CONFIG_MEDIA_TUNER_XC5000
 
 #endif // __XC5000_H__
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 6ec5afba1ca7..73dc2ee9b014 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -9,7 +9,7 @@ config DVB_B2C2_FLEXCOP
         select DVB_STV0297 if !DVB_FE_CUSTOMISE
         select DVB_BCM3510 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-        select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select DVB_S5H1420 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index 902c762e0b7f..d1239b8342f8 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 TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select FW_LOADER
         help
           Support for PCI cards based on the Bt8xx PCI bridge. Examples are
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 75711bde23ad..a7637562e742 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1714,7 +1714,7 @@ static void dst_release(struct dvb_frontend *fe)
         struct dst_state *state = fe->demodulator_priv;
         if (state->dst_ca) {
                 dvb_unregister_device(state->dst_ca);
-#ifdef CONFIG_DVB_CORE_ATTACH
+#ifdef CONFIG_MEDIA_ATTACH
                 symbol_put(dst_ca_attach);
 #endif
         }
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 2dddd08c5445..8cbdb218952f 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1189,7 +1189,7 @@ int dvb_unregister_frontend(struct dvb_frontend* fe)
 }
 EXPORT_SYMBOL(dvb_unregister_frontend);
 
-#ifdef CONFIG_DVB_CORE_ATTACH
+#ifdef CONFIG_MEDIA_ATTACH
 void dvb_frontend_detach(struct dvb_frontend* fe)
 {
         void *ptr;
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index 5f9a737c6de1..89d12dc477a7 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -115,7 +115,7 @@ extern int dvb_usercopy(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg));
 
 /** generic DVB attach function. */
-#ifdef CONFIG_DVB_CORE_ATTACH
+#ifdef CONFIG_MEDIA_ATTACH
 #define dvb_attach(FUNCTION, ARGS...) ({ \
         void *__r = NULL; \
         typeof(&FUNCTION) __a = symbol_request(FUNCTION); \
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 3c8493d2026d..4c1cff9feb2e 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -25,7 +25,7 @@ config DVB_USB_A800
         tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)"
         depends on DVB_USB
         select DVB_DIB3000MC
-        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         select DVB_PLL if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver.
@@ -35,7 +35,7 @@ config DVB_USB_DIBUSB_MB
         depends on DVB_USB
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MB
-        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_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.
@@ -56,7 +56,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 DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_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.
@@ -73,8 +73,8 @@ config DVB_USB_DIB0700
         select DVB_DIB7000P
         select DVB_DIB7000M
         select DVB_DIB3000MC
-        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
-        select DVB_TUNER_MT2266 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE
         select DVB_TUNER_DIB0070
         help
           Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
@@ -93,7 +93,7 @@ config DVB_USB_UMT_010
         depends on DVB_USB
         select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_DIB3000MC
-        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver.
 
@@ -105,7 +105,7 @@ config DVB_USB_CXUSB
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Conexant USB2.0 hybrid reference design.
           Currently, only DVB and ATSC modes are supported, analog mode
@@ -118,7 +118,7 @@ config DVB_USB_M920X
         tristate "Uli m920x DVB-T USB2.0 support"
         depends on DVB_USB
         select DVB_MT352 if !DVB_FE_CUSTOMISE
-        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_QT1010 if !DVB_FE_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
@@ -129,7 +129,7 @@ config DVB_USB_GL861
         tristate "Genesys Logic GL861 USB2.0 support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0
           receiver with USB ID 0db0:5581.
@@ -138,7 +138,7 @@ config DVB_USB_AU6610
         tristate "Alcor Micro AU6610 USB2.0 support"
         depends on DVB_USB
         select DVB_ZL10353 if !DVB_FE_CUSTOMISE
-        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver.
 
@@ -190,7 +190,7 @@ config DVB_USB_NOVA_T_USB2
         tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
         depends on DVB_USB
         select DVB_DIB3000MC
-        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
         select DVB_PLL if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.
@@ -227,8 +227,8 @@ config DVB_USB_OPERA1
 config DVB_USB_AF9005
         tristate "Afatech AF9005 DVB-T USB1.1 support"
         depends on DVB_USB && EXPERIMENTAL
-        select DVB_TUNER_MT2060 if !DVB_FE_CUSTOMISE
-        select DVB_TUNER_QT1010 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_QT1010 if !DVB_FE_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)
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index e99bfcf28112..7dda5d54716d 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -690,7 +690,7 @@ config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
         depends on PCI && VIDEO_V4L1 && I2C
         select VIDEO_SAA7146_VV
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 73f87aede074..560dc32d4cb7 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -84,7 +84,7 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
 obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
-obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+obj-$(CONFIG_MEDIA_TUNER) += tuner.o
 
 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
index 41708267e7a4..cab277fafa63 100644
--- a/drivers/media/video/au0828/Kconfig
+++ b/drivers/media/video/au0828/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_AU0828
        depends on VIDEO_DEV && I2C && INPUT && DVB_CORE
         select I2C_ALGOBIT
         select DVB_AU8522 if !DVB_FE_CUSTOMIZE
-        select DVB_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
         ---help---
           This is a video4linux driver for Auvitek's USB device.
 
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index cfc822bb502a..7431ef6de9f1 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -6,7 +6,7 @@ config VIDEO_BT848
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index ca5fbce3a909..cadf936c3673 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -4,19 +4,19 @@ config VIDEO_CX23885
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEOBUF_DVB
         select VIDEO_CX25840
-        select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE
         select DVB_S5H1409 if !DVB_FE_CUSTOMISE
         select DVB_LGDT330X if !DVB_FE_CUSTOMISE
         select DVB_PLL if !DVB_FE_CUSTOMISE
-        select TUNER_XC2028 if !DVB_FE_CUSTOMIZE
-        select TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
-        select DVB_TDA18271 if !DVB_FE_CUSTOMIZE
-        select DVB_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
         select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
         ---help---
           This is a video4linux driver for Conexant 23885 based
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 27635cdcbaf2..b0d7d6a7a4cc 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -5,7 +5,7 @@ config VIDEO_CX88
         select FW_LOADER
         select VIDEO_BTCX
         select VIDEOBUF_DMA_SG
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
@@ -57,7 +57,7 @@ config VIDEO_CX88_DVB
         select DVB_NXT200X if !DVB_FE_CUSTOMISE
         select DVB_CX24123 if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
-        select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         select DVB_S5H1411 if !DVB_FE_CUSTOMISE
         ---help---
           This adds support for DVB/ATSC cards based on the
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 9caffed2b6b8..c7c2896bbd8b 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,7 +1,7 @@
 config VIDEO_EM28XX
         tristate "Empia EM28xx USB video capture support"
         depends on VIDEO_DEV && I2C && INPUT
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_IR
         select VIDEOBUF_VMALLOC
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index b6171702c4d0..eec115bf9517 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_IVTV
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_IR
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
         select VIDEO_CX25840
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index da696e155fc6..47b5649729df 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -872,7 +872,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
         unsigned i;
 
         /* load modules */
-#ifndef CONFIG_VIDEO_TUNER
+#ifndef CONFIG_MEDIA_TUNER
         hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER);
 #endif
 #ifndef CONFIG_VIDEO_CX25840
diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
index 158b3d0c6532..f278d980b83a 100644
--- a/drivers/media/video/pvrusb2/Kconfig
+++ b/drivers/media/video/pvrusb2/Kconfig
@@ -2,7 +2,7 @@ config VIDEO_PVRUSB2
         tristate "Hauppauge WinTV-PVR USB2 support"
         depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         select FW_LOADER
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_CX2341X
         select VIDEO_SAA711X
@@ -66,9 +66,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_CUSTOMIZE
-        select DVB_TDA18271 if !DVB_FE_CUSTOMIZE
-        select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
-        select TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
+        select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
         ---help---
 
           This option enables compilation of a DVB interface for the
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index e086f14d5663..40e4c3bd2cb9 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_SAA7134
         depends on VIDEO_DEV && PCI && I2C && INPUT
         select VIDEOBUF_DMA_SG
         select VIDEO_IR
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_TVEEPROM
         select CRC32
         ---help---
@@ -35,9 +35,9 @@ config VIDEO_SAA7134_DVB
         select DVB_NXT200X if !DVB_FE_CUSTOMISE
         select DVB_TDA10086 if !DVB_FE_CUSTOMISE
         select DVB_TDA826X if !DVB_FE_CUSTOMISE
-        select DVB_TDA827X if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
         select DVB_ISL6421 if !DVB_FE_CUSTOMISE
-        select TUNER_SIMPLE if !DVB_FE_CUSTOMISE
+        select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
         ---help---
           This adds support for DVB cards based on the
           Philips saa7134 chip.
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 24ae2bc516ab..6d4b9217ec3e 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -56,7 +56,7 @@ struct tuner {
 
 /* standard i2c insmod options */
 static unsigned short normal_i2c[] = {
-#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
+#if defined(CONFIG_MEDIA_TUNER_TEA5761) || (defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) && defined(MODULE))
         0x10,
 #endif
         0x42, 0x43, 0x4a, 0x4b,                 /* tda8290 */
diff --git a/drivers/media/video/usbvision/Kconfig b/drivers/media/video/usbvision/Kconfig
index fc24ef05b3f3..74e1d3075a20 100644
--- a/drivers/media/video/usbvision/Kconfig
+++ b/drivers/media/video/usbvision/Kconfig
@@ -1,7 +1,7 @@
 config VIDEO_USBVISION
         tristate "USB video devices based on Nogatech NT1003/1004/1005"
         depends on I2C && VIDEO_V4L2
-        select VIDEO_TUNER
+        select MEDIA_TUNER
         select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
         ---help---
           There are more than 50 different USB video devices based on