upgrade to ckrm e17

[linux-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index f4b5adf..4efd7b8 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -46,19 +46,13 @@
 #include <linux/rmap.h>
 #include <linux/mempolicy.h>
 #include <linux/key.h>
+#include <linux/ckrm_events.h>
+#include <linux/ckrm_sched.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
 #include <asm/setup.h>
 
-#include <linux/ckrm.h>
-#ifdef CONFIG_CKRM_CPU_SCHEDULE
-int __init init_ckrm_sched_res(void);
-#else
-#define init_ckrm_sched_res() ((void)0)
-#endif
-//#include <linux/ckrm_sched.h>
-
 /*
  * This is one of the first .c files built. Error out early
  * if we have compiler trouble..