Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[platform/kernel/linux-rpi.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 62ded9f..2421e15 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -86,7 +86,6 @@ extern void init_IRQ(void);
 extern void fork_init(unsigned long);
 extern void mca_init(void);
 extern void sbus_init(void);
-extern void sysctl_init(void);
 extern void signals_init(void);
 extern void pidhash_init(void);
 extern void pidmap_init(void);
@@ -702,8 +701,8 @@ static void __init do_basic_setup(void)
        usermodehelper_init();
        driver_init();
 
-#ifdef CONFIG_SYSCTL
-       sysctl_init();
+#ifdef CONFIG_PROC_FS
+       init_irq_proc();
 #endif
 
        do_initcalls();