Merge commit 'v2.6.28-rc2' into tracing/urgent

[net-next-2.6.git] / arch / x86 / include / asm / ftrace.h

diff --git a/include/asm-x86/ftrace.h b/arch/x86/include/asm/ftrace.h
similarity index 85%
rename from include/asm-x86/ftrace.h
rename to arch/x86/include/asm/ftrace.h
index 233bb9b869c0605665b48a51b7b46f5f7ffc40a6..9e8bc29b8b17dd3739d7479af6920c3c627130cb 100644 (file)
--- a/include/asm-x86/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__FTRACE_H
-#define ASM_X86__FTRACE_H
+#ifndef _ASM_X86_FTRACE_H
+#define _ASM_X86_FTRACE_H
 
 #ifdef CONFIG_FUNCTION_TRACER
 #define MCOUNT_ADDR            ((long)(mcount))
@@ -21,4 +21,4 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
 
 #endif /* CONFIG_FUNCTION_TRACER */
 
-#endif /* ASM_X86__FTRACE_H */
+#endif /* _ASM_X86_FTRACE_H */