aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-07-08 13:00:17 -0400
committerRusty Russell <rusty@rustcorp.com.au>2008-07-22 05:24:31 -0400
commita1ef5adb4cad43460ebba23c5a78cf4a55bb6a5b (patch)
tree1556b41ff7a03a6941cb363d97204bfef501f9c4 /kernel/sysctl.c
parenta00caa1fa954c734f4214a074727a329a9ba6568 (diff)
remove CONFIG_KMOD from core kernel code
Always compile request_module when the kernel allows modules. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6b16e16428d8..b859e6b5a767 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -110,7 +110,7 @@ static int min_percpu_pagelist_fract = 8;
110 110
111static int ngroups_max = NGROUPS_MAX; 111static int ngroups_max = NGROUPS_MAX;
112 112
113#ifdef CONFIG_KMOD 113#ifdef CONFIG_MODULES
114extern char modprobe_path[]; 114extern char modprobe_path[];
115#endif 115#endif
116#ifdef CONFIG_CHR_DEV_SG 116#ifdef CONFIG_CHR_DEV_SG
@@ -475,7 +475,7 @@ static struct ctl_table kern_table[] = {
475 .proc_handler = &ftrace_enable_sysctl, 475 .proc_handler = &ftrace_enable_sysctl,
476 }, 476 },
477#endif 477#endif
478#ifdef CONFIG_KMOD 478#ifdef CONFIG_MODULES
479 { 479 {
480 .ctl_name = KERN_MODPROBE, 480 .ctl_name = KERN_MODPROBE,
481 .procname = "modprobe", 481 .procname = "modprobe",