Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

[linux-2.6-omap-h63xx.git] / kernel / trace / trace_power.c

diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c
index 7bda248daf5557a04ff1f178764b80777a33dff5..faa6ab7a1f5c589b92a9b4ea7e23f20168ea6263 100644 (file)
--- a/kernel/trace/trace_power.c
+++ b/kernel/trace/trace_power.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 
 #include "trace.h"
+#include "trace_output.h"
 
 static struct trace_array *power_trace;
 static int __read_mostly trace_power_enabled;