diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 04:28:38 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-16 11:38:35 -0400 |
commit | a65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (patch) | |
tree | 2143455a8bbcb49bbcef746e45f06e497f2eadfb /drivers/media/video/w9968cf.c | |
parent | 04ab591808565f968d4406f6435090ad671ebdab (diff) |
remove CONFIG_KMOD from drivers
Straight forward conversions to CONFIG_MODULE; many drivers
include <linux/kmod.h> conditionally and then don't have any
other conditional code so remove it from those.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: video4linux-list@redhat.com
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: linux-ppp@vger.kernel.org
Cc: dm-devel@redhat.com
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/media/video/w9968cf.c')
-rw-r--r-- | drivers/media/video/w9968cf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 11edf79f57be..dcd45dbd82dc 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -111,7 +111,7 @@ static int specific_debug = W9968CF_SPECIFIC_DEBUG; | |||
111 | 111 | ||
112 | static unsigned int param_nv[24]; /* number of values per parameter */ | 112 | static unsigned int param_nv[24]; /* number of values per parameter */ |
113 | 113 | ||
114 | #ifdef CONFIG_KMOD | 114 | #ifdef CONFIG_MODULES |
115 | module_param(ovmod_load, bool, 0644); | 115 | module_param(ovmod_load, bool, 0644); |
116 | #endif | 116 | #endif |
117 | module_param(simcams, ushort, 0644); | 117 | module_param(simcams, ushort, 0644); |
@@ -144,7 +144,7 @@ module_param(debug, ushort, 0644); | |||
144 | module_param(specific_debug, bool, 0644); | 144 | module_param(specific_debug, bool, 0644); |
145 | #endif | 145 | #endif |
146 | 146 | ||
147 | #ifdef CONFIG_KMOD | 147 | #ifdef CONFIG_MODULES |
148 | MODULE_PARM_DESC(ovmod_load, | 148 | MODULE_PARM_DESC(ovmod_load, |
149 | "\n<0|1> Automatic 'ovcamchip' module loading." | 149 | "\n<0|1> Automatic 'ovcamchip' module loading." |
150 | "\n0 disabled, 1 enabled." | 150 | "\n0 disabled, 1 enabled." |