diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 23:02:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 23:02:33 -0300 |
| commit | ff138171ec6f84f311fe8c0395ad7f9e6d04feec (patch) | |
| tree | 7ad0ecafefb46988a6f8a69fd3fd6c43afa7b7d0 /drivers/media | |
| parent | 33ae0cdd3eaba219e7c2f0647b6db4be540e2130 (diff) | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cx18/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/tuner-core.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index be654a27bd3..acc4b47f1d1 100644 --- 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 9f31befc313..8f5ed9b4bf8 100644 --- 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 cc19c4abb46..6bf104ea051 100644 --- 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); \ |