diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 04:18:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 04:18:43 -0500 |
| commit | 99793e3dbe39a50d871eedc361659a894601e2bf (patch) | |
| tree | a676d42a42f4c884e38121e5a5a4d6630929a9f7 /kernel/trace/trace_power.c | |
| parent | 3e80680208ba6ce9635ca7c21ad0019442ea166a (diff) | |
| parent | a103e2ab7377dbbef2506be59c49a3f2ae10b60b (diff) | |
Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'kernel/trace/trace_power.c')
| -rw-r--r-- | kernel/trace/trace_power.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c index 7bda248daf55..faa6ab7a1f5c 100644 --- a/kernel/trace/trace_power.c +++ b/kernel/trace/trace_power.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | 17 | ||
| 18 | #include "trace.h" | 18 | #include "trace.h" |
| 19 | #include "trace_output.h" | ||
| 19 | 20 | ||
| 20 | static struct trace_array *power_trace; | 21 | static struct trace_array *power_trace; |
| 21 | static int __read_mostly trace_power_enabled; | 22 | static int __read_mostly trace_power_enabled; |