diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 21:38:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 18:41:38 -0300 |
| commit | 149ef72deeba57078216c9fa678baff392295853 (patch) | |
| tree | 038cf488b424094b0dbe05a63a9cbb28f87eaaec /drivers/media/video/ivtv/ivtv-driver.c | |
| parent | f1784354f774e1fa4863fc6382296ef6ede26dc5 (diff) | |
| download | kernel_samsung_smdk4412-149ef72deeba57078216c9fa678baff392295853.zip kernel_samsung_smdk4412-149ef72deeba57078216c9fa678baff392295853.tar.gz kernel_samsung_smdk4412-149ef72deeba57078216c9fa678baff392295853.tar.bz2 | |
Rename common tuner Kconfig names to use the same
namespace for all of them.
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index da696e1..47b5649 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -872,7 +872,7 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) unsigned i; /* load modules */ -#ifndef CONFIG_VIDEO_TUNER +#ifndef CONFIG_MEDIA_TUNER hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER); #endif #ifndef CONFIG_VIDEO_CX25840 |