diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 10:58:33 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 10:58:33 -0400 |
| commit | 4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch) | |
| tree | 8abf41a79f293832a430a9609530c24cd365466c /tools/perf/scripts | |
| parent | 390de835b61228abf6646f2b14530edca8d7512f (diff) | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'tools/perf/scripts')
| -rw-r--r-- | tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs index c1e2ed1ed34e..8c7ea42444d1 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include "perl.h" | 23 | #include "perl.h" |
| 24 | #include "XSUB.h" | 24 | #include "XSUB.h" |
| 25 | #include "../../../perf.h" | 25 | #include "../../../perf.h" |
| 26 | #include "../../../util/script-event.h" | 26 | #include "../../../util/trace-event.h" |
| 27 | 27 | ||
| 28 | MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context | 28 | MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context |
| 29 | PROTOTYPES: ENABLE | 29 | PROTOTYPES: ENABLE |