diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-10-18 18:30:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-18 18:30:49 +0100 |
| commit | 112d6212c80a1c560757520bd822a41c0ad15c2c (patch) | |
| tree | 051580f1a55aa8d1b59120f21767a624d0291dbc /tools/perf/scripts | |
| parent | spi: Fix SPI_CS_HIGH setting when using native and GPIO CS (diff) | |
| parent | Linux 5.4-rc3 (diff) | |
| download | linux-dev-112d6212c80a1c560757520bd822a41c0ad15c2c.tar.xz linux-dev-112d6212c80a1c560757520bd822a41c0ad15c2c.zip | |
Merge tag 'v5.4-rc3' into spi-5.4
Linux 5.4-rc3
Diffstat (limited to 'tools/perf/scripts')
| -rw-r--r-- | tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 1 | ||||
| -rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/Context.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c index ead521dd8d79..25c47d23a130 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c @@ -19,7 +19,6 @@ #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#include "../../../perf.h" #include "../../../util/trace-event.h" #ifndef PERL_UNUSED_VAR diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c index 217568bc29ce..0b7096847991 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c @@ -6,7 +6,6 @@ */ #include <Python.h> -#include "../../../perf.h" #include "../../../util/trace-event.h" #if PY_MAJOR_VERSION < 3 |