diff --git a/[refs] b/[refs]
index fab2f435702e..fc87d2e77633 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43dd61c9a09bd413e837df829e6bfb42159be52a
+refs/heads/master: 04da85b86188f224cc9b391b5bdd92a3ba20ffcf
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index ed0eb5254d1c..f0c0e8a47ae6 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -19,6 +19,8 @@
 
 #include <asm/ftrace.h>
 
+struct ftrace_hash;
+
 #ifdef CONFIG_FUNCTION_TRACER
 
 extern int ftrace_enabled;
@@ -29,8 +31,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
 
 typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
 
-struct ftrace_hash;
-
 enum {
 	FTRACE_OPS_FL_ENABLED		= 1 << 0,
 	FTRACE_OPS_FL_GLOBAL		= 1 << 1,