diff options
| author | Alexander Graf <agraf@suse.de> | 2013-08-28 18:41:59 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-08-28 18:41:59 -0400 |
| commit | bf550fc93d9855872a95e69e4002256110d89858 (patch) | |
| tree | 10876bb4304bffe54c4160a132e7b8de6577ac4e /tools/perf/scripts | |
| parent | 7e48c101e0c53e6095c5f4f5e63d14df50aae8fc (diff) | |
| parent | cc2df20c7c4ce594c3e17e9cc260c330646012c8 (diff) | |
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
mm/Kconfig
CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
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 |