diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 20:38:46 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 17:41:38 -0400 |
| commit | 149ef72deeba57078216c9fa678baff392295853 (patch) | |
| tree | 038cf488b424094b0dbe05a63a9cbb28f87eaaec /drivers/media/video/ivtv/ivtv-driver.c | |
| parent | f1784354f774e1fa4863fc6382296ef6ede26dc5 (diff) | |
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 da696e155fc..47b5649729d 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) | |||
| 872 | unsigned i; | 872 | unsigned i; |
| 873 | 873 | ||
| 874 | /* load modules */ | 874 | /* load modules */ |
| 875 | #ifndef CONFIG_VIDEO_TUNER | 875 | #ifndef CONFIG_MEDIA_TUNER |
| 876 | hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER); | 876 | hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER); |
| 877 | #endif | 877 | #endif |
| 878 | #ifndef CONFIG_VIDEO_CX25840 | 878 | #ifndef CONFIG_VIDEO_CX25840 |