Merge branch 'auto-ftrace-next' into tracing/for-linus

[sfrench/cifs-2.6.git] / arch / x86 / kernel / i386_ksyms_32.c

diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
index 29999dbb754ce949b7956ae3d0cd064b21c03612..dd7ebee446afaab244041868b67d89833b8d00c5 100644 (file)
--- a/arch/x86/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -1,9 +1,9 @@
-#include <linux/ftrace.h>
 #include <linux/module.h>
 
 #include <asm/checksum.h>
 #include <asm/pgtable.h>
 #include <asm/desc.h>
+#include <asm/ftrace.h>
 
 #ifdef CONFIG_FTRACE
 /* mcount is defined in assembly */