diff options
| author | Ingo Molnar | 2009-03-10 22:55:31 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-10 22:55:31 +0100 |
| commit | e2b8b2808538a91444e78c7db5a30519cadd09b2 (patch) | |
| tree | 60c45581817db746bd61670f5c95b19c2661daa0 /kernel/trace/trace_branch.c | |
| parent | Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/... (diff) | |
| parent | tracing: remove funky whitespace in the trace code (diff) | |
| download | kernel-qcow2-linux-e2b8b2808538a91444e78c7db5a30519cadd09b2.tar.gz kernel-qcow2-linux-e2b8b2808538a91444e78c7db5a30519cadd09b2.tar.xz kernel-qcow2-linux-e2b8b2808538a91444e78c7db5a30519cadd09b2.zip | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_branch.c')
| -rw-r--r-- | kernel/trace/trace_branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index aaa0755268b9..ad8c22efff41 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -157,7 +157,7 @@ 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, }; |