diff --git a/[refs] b/[refs]
index 8b8bddf5c5e6..a1a53b4ce16f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29cbeb0e17d9d2ca824f62f71cfa7360b3157112
+refs/heads/master: 2b7207a6b53bd07be53b4753a3ea5ecb8d180048
diff --git a/trunk/include/asm-x86/ftrace.h b/trunk/include/asm-x86/ftrace.h
index c184441133f2..5c68b32ee1c8 100644
--- a/trunk/include/asm-x86/ftrace.h
+++ b/trunk/include/asm-x86/ftrace.h
@@ -1,5 +1,5 @@
 #ifndef _ASM_X86_FTRACE
-#define _ASM_SPARC64_FTRACE
+#define _ASM_X86_FTRACE
 
 #ifdef CONFIG_FTRACE
 #define MCOUNT_ADDR		((long)(mcount))