diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-11-03 12:06:51 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 11:11:28 +0100 |
| commit | 58ae1c23184772a7b2d02a4a82f5515a7820a155 (patch) | |
| tree | 94449cfeb20e150c92ce506be23f4684e44b054b /drivers/media/video/cx18 | |
| parent | V4L/DVB (9499): cx88-mpeg: final fix for analogue only compilation + de-alloc... (diff) | |
| download | linux-58ae1c23184772a7b2d02a4a82f5515a7820a155.tar.xz linux-58ae1c23184772a7b2d02a4a82f5515a7820a155.zip | |
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) #ifdef MODULE /* load modules */ -#ifndef CONFIG_MEDIA_TUNER +#ifdef CONFIG_MEDIA_TUNER_MODULE hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); #endif -#ifndef CONFIG_VIDEO_CS5345 +#ifdef CONFIG_VIDEO_CS5345_MODULE hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345); #endif #endif |