From da6f5f1f61c35abe8a7d6d9d9238c1e53e7c6ba2 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 4 May 2012 09:26:16 -0400
Subject: [PATCH] --- yaml --- r: 304864 b: refs/heads/master c:
 59a094c994a138049b41a44bc29cff9407d51c5b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/ftrace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 15aa10769b4a..a54e44c6b80f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a6d70c9505fef1d8906b1d61db3de5d8ecf9454
+refs/heads/master: 59a094c994a138049b41a44bc29cff9407d51c5b
diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c
index cf2d03ec1793..4243e8bbdcb1 100644
--- a/trunk/arch/x86/kernel/ftrace.c
+++ b/trunk/arch/x86/kernel/ftrace.c
@@ -20,11 +20,11 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/kprobes.h>
 
 #include <trace/syscall.h>
 
 #include <asm/cacheflush.h>
+#include <asm/kprobes.h>
 #include <asm/ftrace.h>
 #include <asm/nops.h>