Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / kernel / trace / trace_branch.c

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index c2e68d440c4da925f8810e57009abf40e3ca77b7..ad8c22efff417ac1711cb4cc35c245b5a11c8efa 100644 (file)
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -157,9 +157,8 @@ static enum print_line_t trace_branch_print(struct trace_iterator *iter,
 
 
 static struct trace_event trace_branch_event = {
-       .type           = TRACE_BRANCH,
+       .type           = TRACE_BRANCH,
        .trace          = trace_branch_print,
-       .latency_trace  = trace_branch_print,
 };
 
 static struct tracer branch_trace __read_mostly =