From e9fc09f4bd2bae682cea6e7155aad1fe3f58e77b Mon Sep 17 00:00:00 2001
From: Jonathan Herman <hermanjl@cs.unc.edu>
Date: Sat, 29 Sep 2012 13:05:45 -0400
Subject: Resolved merge bugs.

---
 kernel/sched.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'kernel')

diff --git a/kernel/sched.c b/kernel/sched.c
index d9d591e70b03..4f76f883f831 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -83,9 +83,6 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/sched.h>
 
-#define CREATE_TRACE_POINTS
-#include <trace/events/sched.h>
-
 #include <litmus/sched_trace.h>
 #include <litmus/trace.h>
 
-- 
cgit v1.2.2