projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-flexiantxendom0-3.2.10.git]
/
include
/
trace
/
events
/
power.h
diff --git
a/include/trace/events/power.h
b/include/trace/events/power.h
index
14b3894
..
cae9a94
100644
(file)
--- a/
include/trace/events/power.h
+++ b/
include/trace/events/power.h
@@
-65,7
+65,6
@@
TRACE_EVENT(machine_suspend,
TP_printk("state=%lu", (unsigned long)__entry->state)
);
-/* This code will be removed after deprecation time exceeded (2.6.41) */
#ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
/*