diff options
| author | Michal Marek <mmarek@suse.cz> | 2013-02-25 15:50:05 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-02-25 15:51:57 -0500 |
| commit | e3900e74f26fc924c8e9e2a922bd40369b0bb517 (patch) | |
| tree | 6e868575d346032ba9408f350c6e5369e0e52b0d /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | 62dc989921df2a98d1a73aacd085abe941cb9828 (diff) | |
| parent | 02f3e53a131c8aa3fe3c954058f1add5beeae621 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 730c6630cba5..14683dfca2ee 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include "../event.h" | 32 | #include "../event.h" |
| 33 | #include "../thread.h" | 33 | #include "../thread.h" |
| 34 | #include "../trace-event.h" | 34 | #include "../trace-event.h" |
| 35 | #include "../evsel.h" | ||
| 36 | 35 | ||
| 37 | PyMODINIT_FUNC initperf_trace_context(void); | 36 | PyMODINIT_FUNC initperf_trace_context(void); |
| 38 | 37 | ||