diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2019-04-16 11:50:34 +0300 |
---|---|---|
committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2019-04-16 11:50:34 +0300 |
commit | 95d002e0a34cb0f238abb39987f9980f325d8332 (patch) | |
tree | b8ed70572a55b4e67410f906159f86e8aabb0f6a /tools/perf/scripts/python/Perf-Trace-Util/Build | |
parent | d57b39e3ee3cdb4b00452090e386d197980cefc9 (diff) | |
parent | 28d618e9ab86f26a31af0b235ced55beb3e343c8 (diff) | |
download | linux-95d002e0a34cb0f238abb39987f9980f325d8332.tar.xz |
Merge tag 'drm-intel-next-2019-04-04' into gvt-next
Merge back drm-intel-next for engine name definition refinement
and 54939ea0bd85 ("drm/i915: Switch to use HWS indices rather than addresses")
that would need gvt fixes to depend on.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/Build')
-rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/Build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Build b/tools/perf/scripts/python/Perf-Trace-Util/Build index aefc15c9444a..7d0e33ce6aba 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Build +++ b/tools/perf/scripts/python/Perf-Trace-Util/Build @@ -1,3 +1,3 @@ -libperf-y += Context.o +perf-y += Context.o CFLAGS_Context.o += $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs |