Merge tag 'v3.17' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / kernel / sched / idle.c
index 11e7bc4..b5af7b6 100644 (file)
 
 #include <trace/events/power.h>
 
-#include "sched.h"
+#ifdef CONFIG_MOD_SCHED
+#include <os/linux.h>
+#else
+#include "cfs/sched.h"
+#endif
 
 static int __read_mostly cpu_idle_force_poll;