diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-23 02:23:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-23 02:23:20 -0400 |
| commit | 43315956509ca6913764861ac7dec128b91eb1ec (patch) | |
| tree | 60fd5647f150a46e63093a41417c2eef3e776b3d /include/trace/events/power.h | |
| parent | 9bf4e7fba8006d19846fec877b6da0616b2772de (diff) | |
| parent | 6beba7adbe092e63dfe8d09fbd1e3ec140474a13 (diff) | |
Merge branch 'perf/core' into perf/probes
Conflicts:
tools/perf/Makefile
Merge reason:
- fix the conflict
- pick up the pr_*() infrastructure to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/trace/events/power.h')
| -rw-r--r-- | include/trace/events/power.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/trace/events/power.h b/include/trace/events/power.h index ea6d579261ad..9bb96e5a2848 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h | |||
| @@ -16,8 +16,6 @@ enum { | |||
| 16 | }; | 16 | }; |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | |||
| 20 | |||
| 21 | TRACE_EVENT(power_start, | 19 | TRACE_EVENT(power_start, |
| 22 | 20 | ||
| 23 | TP_PROTO(unsigned int type, unsigned int state), | 21 | TP_PROTO(unsigned int type, unsigned int state), |