diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-11-03 06:06:51 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 05:11:28 -0500 |
commit | 58ae1c23184772a7b2d02a4a82f5515a7820a155 (patch) | |
tree | 94449cfeb20e150c92ce506be23f4684e44b054b /drivers/media/video/cx18 | |
parent | 1a8dc86db1546f60a25f2b5cd071c0091db87146 (diff) |
V4L/DVB (9506): ivtv/cx18: fix test whether modules should be loaded or not.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 7a1a7830a6b3..6a840f2d81a0 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
@@ -581,10 +581,10 @@ static void cx18_load_and_init_modules(struct cx18 *cx) | |||
581 | 581 | ||
582 | #ifdef MODULE | 582 | #ifdef MODULE |
583 | /* load modules */ | 583 | /* load modules */ |
584 | #ifndef CONFIG_MEDIA_TUNER | 584 | #ifdef CONFIG_MEDIA_TUNER_MODULE |
585 | hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); | 585 | hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); |
586 | #endif | 586 | #endif |
587 | #ifndef CONFIG_VIDEO_CS5345 | 587 | #ifdef CONFIG_VIDEO_CS5345_MODULE |
588 | hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345); | 588 | hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345); |
589 | #endif | 589 | #endif |
590 | #endif | 590 | #endif |