summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-11-03 12:06:51 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2008-11-03 12:06:51 +0100
commit5c32a3fe687864cffa45614ab894311fa6d303f9 (patch)
treed10bfc282c202f436134a5fb8ae5c7907912c2b8 /linux/drivers/media/video/cx18/cx18-driver.c
parentb67e9d19329d1dc7b33dbe64931d630fee7b4c47 (diff)
downloadmediapointer-dvb-s2-5c32a3fe687864cffa45614ab894311fa6d303f9.tar.gz
mediapointer-dvb-s2-5c32a3fe687864cffa45614ab894311fa6d303f9.tar.bz2
ivtv/cx18: fix test whether modules should be loaded or not.
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
-rw-r--r--linux/drivers/media/video/cx18/cx18-driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c
index c95230999..c7ab5ab67 100644
--- a/linux/drivers/media/video/cx18/cx18-driver.c
+++ b/linux/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