From 77aa13269a6087212e282cd37fb4fcc5293ad9bc Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Tue, 31 Mar 2009 20:41:31 +0800
Subject: [PATCH] --- yaml --- r: 142777 b: refs/heads/master c:
 5ab8026a3016fbed5c73aa070d9f6989cf791099 h: refs/heads/master i:   142775:
 f4060995e4a0f8e7ff413b2890bd649e97b6136a v: v3

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

diff --git a/[refs] b/[refs]
index 704477a35c56..e19b6ca254bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bcae09b93e7f96f700b6bb372c2b3f2b36636dc
+refs/heads/master: 5ab8026a3016fbed5c73aa070d9f6989cf791099
diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c
index 61df77532120..70a10ca100f6 100644
--- a/trunk/arch/x86/kernel/ftrace.c
+++ b/trunk/arch/x86/kernel/ftrace.c
@@ -20,7 +20,6 @@
 
 #include <asm/cacheflush.h>
 #include <asm/ftrace.h>
-#include <linux/ftrace.h>
 #include <asm/nops.h>
 #include <asm/nmi.h>