From 2873e0f427763a8c3904c884a012fcb3a5afbf74 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 2 Oct 2008 17:45:47 +0200
Subject: [PATCH] --- yaml --- r: 116670 b: refs/heads/master c:
 3e1932ad59726d794a865cc159c0593d54bf0cb6 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ftrace.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 44a52a00b839..967396773deb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5601020feb0c3010e9e3e0131e9697ac6a06777b
+refs/heads/master: 3e1932ad59726d794a865cc159c0593d54bf0cb6
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index e672e51c40a9..deded114dffd 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -1,14 +1,14 @@
 #ifndef _LINUX_FTRACE_H
 #define _LINUX_FTRACE_H
 
-#ifdef CONFIG_FTRACE
-
 #include <linux/linkage.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kallsyms.h>
 
+#ifdef CONFIG_FTRACE
+
 extern int ftrace_enabled;
 extern int
 ftrace_enable_sysctl(struct ctl_table *table, int write,