V4L/DVB (7789b): Fix merge conflicts

Some Kconfig names were changed. This patch reapplies the rename script,
fixing for those drivers merged after the patch that renamed those
items.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig
index be654a27bd3c11e842df9d270d43e806f5e9dc02..acc4b47f1d1dc8437ba648c7509d78f3a71ebfed 100644 (file)
--- a/drivers/media/video/cx18/Kconfig
+++ b/drivers/media/video/cx18/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_CX18
        select I2C_ALGOBIT
        select FW_LOADER
        select VIDEO_IR
-       select VIDEO_TUNER
+       select MEDIA_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_CX2341X
        select VIDEO_CS5345

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 9f31befc31396b7f4183dbcba01284b3b58159b1..8f5ed9b4bf8327df434285194730f888d2a83a8b 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -567,7 +567,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
        int i;
 
        /* load modules */
-#ifndef CONFIG_VIDEO_TUNER
+#ifndef CONFIG_MEDIA_TUNER
        hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
 #endif
 #ifndef CONFIG_VIDEO_CS5345

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index cc19c4abb467901d741c58b3aea4f1ca2fa46a9c..6bf104ea051da24c06c8b7d7bfe470555bd2f964 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -34,7 +34,7 @@
 #define PREFIX t->i2c->driver->driver.name
 
 /** This macro allows us to probe dynamically, avoiding static links */
-#ifdef CONFIG_DVB_CORE_ATTACH
+#ifdef CONFIG_MEDIA_ATTACH
 #define tuner_symbol_probe(FUNCTION, ARGS...) ({ \
        int __r = -EINVAL; \
        typeof(&FUNCTION) __a = symbol_request(FUNCTION); \