4 files changed, 9 insertions, 5 deletions

diff --git a/init/Kconfig b/init/Kconfig
index ad33c979e0b3..f977086e118a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -125,6 +125,12 @@ config IPC_NS
           environments, to use ipc namespaces to provide different ipc
           objects for different servers.  If unsure, say N.
 
+config SYSVIPC_SYSCTL
+        bool
+        depends on SYSVIPC
+        depends on SYSCTL
+        default y
+
 config POSIX_MQUEUE
         bool "POSIX Message Queues"
         depends on NET && EXPERIMENTAL
diff --git a/init/calibrate.c b/init/calibrate.c
index d206c7548fe6..40ff3b404895 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
 
-#include <linux/sched.h>
+#include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 
diff --git a/init/main.c b/init/main.c
index 62ded9f3b393..2421e1544127 100644
--- 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();
diff --git a/init/version.c b/init/version.c
index 6c01ec1cc48d..9d17d70ee02d 100644
--- a/init/version.c
+++ b/init/version.c
@@ -12,7 +12,6 @@
 #include <linux/utsname.h>
 #include <linux/utsrelease.h>
 #include <linux/version.h>
-#include <linux/sched.h>
 
 #define version(a) Version_ ## a
 #define version_string(a) version(a)