Merge branch 'wip-merge-2.6.36' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-merge-2.6.36

1 files changed, 2 insertions, 6 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 99c35ac99870..0756d0156f8f 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -6,20 +6,16 @@
 #include <asm/uaccess.h>
 #include <linux/uaccess.h>
 #include <linux/sysrq.h>
-
+#include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 
 #include <litmus/litmus.h>
-#include <linux/sched.h>
-
 #include <litmus/bheap.h>
-
 #include <litmus/trace.h>
-
 #include <litmus/rt_domain.h>
-
 #include <litmus/litmus_proc.h>
+#include <litmus/sched_trace.h>
 
 /* Number of RT tasks that exist in the system */
 atomic_t rt_task_count          = ATOMIC_INIT(0);