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>
This commit is contained in:
parent
33ae0cdd3e
commit
ff138171ec
|
@ -4,7 +4,7 @@ config VIDEO_CX18
|
||||||
select I2C_ALGOBIT
|
select I2C_ALGOBIT
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select VIDEO_IR
|
select VIDEO_IR
|
||||||
select VIDEO_TUNER
|
select MEDIA_TUNER
|
||||||
select VIDEO_TVEEPROM
|
select VIDEO_TVEEPROM
|
||||||
select VIDEO_CX2341X
|
select VIDEO_CX2341X
|
||||||
select VIDEO_CS5345
|
select VIDEO_CS5345
|
||||||
|
|
|
@ -567,7 +567,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* load modules */
|
/* load modules */
|
||||||
#ifndef CONFIG_VIDEO_TUNER
|
#ifndef CONFIG_MEDIA_TUNER
|
||||||
hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
|
hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
|
||||||
#endif
|
#endif
|
||||||
#ifndef CONFIG_VIDEO_CS5345
|
#ifndef CONFIG_VIDEO_CS5345
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#define PREFIX t->i2c->driver->driver.name
|
#define PREFIX t->i2c->driver->driver.name
|
||||||
|
|
||||||
/** This macro allows us to probe dynamically, avoiding static links */
|
/** 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...) ({ \
|
#define tuner_symbol_probe(FUNCTION, ARGS...) ({ \
|
||||||
int __r = -EINVAL; \
|
int __r = -EINVAL; \
|
||||||
typeof(&FUNCTION) __a = symbol_request(FUNCTION); \
|
typeof(&FUNCTION) __a = symbol_request(FUNCTION); \
|
||||||
|
|
Loading…
Reference in New Issue