diff --git a/[refs] b/[refs]
index d70d2475a0fb..ba6c8f723bbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d8b820b2e81954754277723379ae9ed5de316fa
+refs/heads/master: d49dbf33f0bf8748ee3662b973eb57e60525d622
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 017ab44d572a..911d5d80b49f 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -4,6 +4,7 @@
 #ifdef CONFIG_FTRACE
 
 #include <linux/linkage.h>
+#include <linux/fs.h>
 
 extern int ftrace_enabled;
 extern int