diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 06:02:33 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-30 06:02:33 +0400 |
| commit | ff138171ec6f84f311fe8c0395ad7f9e6d04feec (patch) | |
| tree | 7ad0ecafefb46988a6f8a69fd3fd6c43afa7b7d0 /drivers/media/video/tuner-core.c | |
| parent | 33ae0cdd3eaba219e7c2f0647b6db4be540e2130 (diff) | |
| download | linux-ff138171ec6f84f311fe8c0395ad7f9e6d04feec.tar.xz | |
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/video/tuner-core.c')
| -rw-r--r-- | drivers/media/video/tuner-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index cc19c4abb467..6bf104ea051d 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); \ |