OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[uclinux-h8/linux.git]
/
include
/
trace
/
events
/
power.h
diff --git
a/include/trace/events/power.h
b/include/trace/events/power.h
index
630d1e5
..
284244e
100644
(file)
--- a/
include/trace/events/power.h
+++ b/
include/trace/events/power.h
@@
-7,7
+7,7
@@
#include <linux/ktime.h>
#include <linux/pm_qos.h>
#include <linux/tracepoint.h>
-#include <linux/
ftrace_event
.h>
+#include <linux/
trace_events
.h>
#define TPS(x) tracepoint_string(x)