diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
commit | 93da8b221da95a97316e518c94f03856e5d610a9 (patch) | |
tree | 23787f3c0d02507f20d804aac23ef209d66a7586 /drivers/gpu/drm/i915/intel_lrc.h | |
parent | ba63f76e22ee723819c8cec86b31f7ea3182b2ed (diff) | |
parent | 143c97cc652949893c8056c679012f0aeccb80e5 (diff) |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h index 52b3a1fd4059..57ef5833c427 100644 --- a/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h @@ -63,7 +63,6 @@ enum { }; /* Logical Rings */ -void intel_logical_ring_stop(struct intel_engine_cs *engine); void intel_logical_ring_cleanup(struct intel_engine_cs *engine); int logical_render_ring_init(struct intel_engine_cs *engine); int logical_xcs_ring_init(struct intel_engine_cs *engine); |