---

yaml --- r: 48380 b: refs/heads/master c: b04c3af h: refs/heads/master v: v3
git-mirror · Feb 14, 2007 · d3fad79 · d3fad79
1 parent 4f69a99
commit d3fad79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e03036c97b70b2602f7dedaa3a223ed7563c2c9
+refs/heads/master: b04c3afb2b6e2f902b41bb62b73684d92d7e6c34
diff --git a/trunk/init/main.c b/trunk/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();
 }

diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = {
 	{ .ctl_name = 0 }
 };
 
-extern void init_irq_proc (void);
-
 static DEFINE_SPINLOCK(sysctl_lock);
 
 /* called under sysctl_lock */
@@ -1224,7 +1222,6 @@ void __init sysctl_init(void)
 {
 #ifdef CONFIG_PROC_SYSCTL
 	register_proc_table(root_table, proc_sys_root, &root_table_header);
-	init_irq_proc();
 #endif
 }