diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-16 14:04:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-16 14:05:04 +0200 |
| commit | 563c4f85f9f0d63b712081d5b4522152cdcb8b6b (patch) | |
| tree | 92351ab2d60d5fd7ce5745d21c9a60ce6d46c5dd /drivers/gpu/drm/drm_framebuffer.c | |
| parent | 4adcdcea717cb2d8436bef00dd689aa5bc76f11b (diff) | |
| parent | 09c7e8b21d67c3c78ab9701dbc0fb1e9f14a0ba5 (diff) | |
| download | talos-op-linux-563c4f85f9f0d63b712081d5b4522152cdcb8b6b.tar.gz talos-op-linux-563c4f85f9f0d63b712081d5b4522152cdcb8b6b.zip | |
Merge branch 'sched/rt' into sched/core, to pick up -rt changes
Pick up the first couple of patches working towards PREEMPT_RT.
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.c | 2 |
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) struct drm_device *dev = fb->dev; struct drm_atomic_state *state; struct drm_plane *plane; - struct drm_connector *conn; + struct drm_connector *conn __maybe_unused; struct drm_connector_state *conn_state; int i, ret; unsigned plane_mask; |
