From 7b7a9709177bca215b0c532221eff41a1e080cf0 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 22 Jan 2013 16:58:30 -0500
Subject: [PATCH] --- yaml --- r: 349866 b: refs/heads/master c:
 0b07436d95b5404134da4d661fd183eac863513e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a8e5c1444a4c..8440ed336440 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 567cd4da54ff45513d2ca1f0e3cb9ba45b66d6cf
+refs/heads/master: 0b07436d95b5404134da4d661fd183eac863513e
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 481e26269281..13950d9027cb 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -3,8 +3,10 @@
  *
  * Copyright (C) 2008 Steven Rostedt <srostedt@redhat.com>
  */
+#include <linux/ftrace_event.h>
 #include <linux/ring_buffer.h>
 #include <linux/trace_clock.h>
+#include <linux/trace_seq.h>
 #include <linux/spinlock.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
@@ -21,7 +23,6 @@
 #include <linux/fs.h>
 
 #include <asm/local.h>
-#include "trace.h"
 
 static void update_pages_handler(struct work_struct *work);