diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 22:02:33 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 22:02:33 -0400 |
| commit | ff138171ec6f84f311fe8c0395ad7f9e6d04feec (patch) | |
| tree | 7ad0ecafefb46988a6f8a69fd3fd6c43afa7b7d0 /drivers/media/video/cx18/cx18-driver.c | |
| 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/video/cx18/cx18-driver.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 9f31befc3139..8f5ed9b4bf83 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) | |||
| 567 | int i; | 567 | int i; |
| 568 | 568 | ||
| 569 | /* load modules */ | 569 | /* load modules */ |
| 570 | #ifndef CONFIG_VIDEO_TUNER | 570 | #ifndef CONFIG_MEDIA_TUNER |
| 571 | hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); | 571 | hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); |
| 572 | #endif | 572 | #endif |
| 573 | #ifndef CONFIG_VIDEO_CS5345 | 573 | #ifndef CONFIG_VIDEO_CS5345 |