summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 09:33:57 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 17:09:58 +0100
commitb04c3afb2b6e2f902b41bb62b73684d92d7e6c34 (patch)
tree00b164435ec9c9226659852c784e7e0a8c94c8e9 /init
parent[PATCH] sysctl: register the ocfs2 sysctl numbers (diff)
downloadlinux-b04c3afb2b6e2f902b41bb62b73684d92d7e6c34.tar.xz
linux-b04c3afb2b6e2f902b41bb62b73684d92d7e6c34.zip
[PATCH] sysctl: move init_irq_proc into init/main where it belongs
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index 4e9e92bb2b89..a20a5138211f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -705,6 +705,9 @@ static void __init do_basic_setup(void)
#ifdef CONFIG_SYSCTL
sysctl_init();
#endif
+#ifdef CONFIG_PROC_FS
+ init_irq_proc();
+#endif
do_initcalls();
}