Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 535b1d4bd5f406fdc0ce25c7a05c0b4c8ed35b97..77cb720fed4e2ea2783ceba3ede1cbdde6ab4867 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -70,7 +70,7 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/cacheflush.h>
-#include <linux/kmemtrace.h>
+#include <trace/kmemtrace.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/smp.h>