summaryrefslogtreecommitdiffstats
path: root/kernel/trace/power-traces.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-28 23:55:20 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-28 23:55:20 -0800
commit35858adbfca13678af99fb31618ef4428d6dedb0 (patch)
tree3336feaa61324486945816cb52c347733e7c0821 /kernel/trace/power-traces.c
parent197d4db752e67160d79fed09968c2140376a80a3 (diff)
parent4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff)
downloadop-kernel-dev-35858adbfca13678af99fb31618ef4428d6dedb0.zip
op-kernel-dev-35858adbfca13678af99fb31618ef4428d6dedb0.tar.gz
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/trace/power-traces.c')
-rw-r--r--kernel/trace/power-traces.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c
index e06c6e3..9f4f565 100644
--- a/kernel/trace/power-traces.c
+++ b/kernel/trace/power-traces.c
@@ -14,7 +14,5 @@
#define CREATE_TRACE_POINTS
#include <trace/events/power.h>
-EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);
-EXPORT_TRACEPOINT_SYMBOL_GPL(power_end);
EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency);
OpenPOWER on IntegriCloud