diff options
| author | Joonas Lahtinen <[email protected]> | 2019-10-15 11:18:26 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <[email protected]> | 2019-10-15 11:18:26 +0300 |
| commit | fa41d6ee904266fa8739cafa6ec038c3a8e435b7 (patch) | |
| tree | 4d5439bafd38dc730838bb15e6a49e747793d4a7 /tools/perf/scripts/python | |
| parent | 9cd20ef7803cc53a00c6eb7198b3d870ac7b3766 (diff) | |
| parent | 7ed093602e0e1b60a0fc074a9692687e7d2b723d (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Backmerging to pull in HDR DP code:
https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html
Signed-off-by: Joonas Lahtinen <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
| -rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/Context.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 |