| commit | 66c6e29f24a50173fc1e761c3e2483c8d64e3b1a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Aug 28 13:53:07 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Aug 28 13:53:07 2009 +0200 |
| tree | 15b9d212d02d6e1bae8696d9c5da9a778455f9c0 | |
| parent | 6c347d43eea29221a8ebab9ff9cbe7a00cddac98 [diff] | |
| parent | 117226d15850387b55fd01675917ee4fcb9699e8 [diff] |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index a89ed59..2a4b3bf 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h
@@ -62,6 +62,7 @@ #endif #undef TRACE_EVENT +#undef TRACE_EVENT_FN #undef TRACE_HEADER_MULTI_READ /* Only undef what we defined in this file */