aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_framebuffer.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-09-03 03:23:41 -0400
committerIngo Molnar <mingo@kernel.org>2019-09-03 03:23:41 -0400
commitae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch)
tree223f50677aa00eb6f2a6529099a1005c7e43c071 /drivers/gpu/drm/drm_framebuffer.c
parentc84b82dd3e593db217f23c60f7edae02c76a3c4c (diff)
parent089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff)
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/drm_framebuffer.c')
-rw-r--r--drivers/gpu/drm/drm_framebuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 0b72468e8131..57564318ceea 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -835,7 +835,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
835 struct drm_device *dev = fb->dev; 835 struct drm_device *dev = fb->dev;
836 struct drm_atomic_state *state; 836 struct drm_atomic_state *state;
837 struct drm_plane *plane; 837 struct drm_plane *plane;
838 struct drm_connector *conn; 838 struct drm_connector *conn __maybe_unused;
839 struct drm_connector_state *conn_state; 839 struct drm_connector_state *conn_state;
840 int i, ret; 840 int i, ret;
841 unsigned plane_mask; 841 unsigned plane_mask;