diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 15:56:49 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 15:56:49 +0300 |
| commit | 32f35b863451884e856f0f577474740561a87fad (patch) | |
| tree | 2d1d55c7e2d23e27197bf84246c5f23070eb0fce /drivers/media/platform/davinci/vpif_display.c | |
| parent | ae7617f0ef1820be033eef93859a6bb6174a843f (diff) | |
| parent | 754270c7c56292e97d0eff924a5d5d83f92add07 (diff) | |
| download | talos-obmc-linux-32f35b863451884e856f0f577474740561a87fad.tar.gz talos-obmc-linux-32f35b863451884e856f0f577474740561a87fad.zip | |
Merge drm-upstream/drm-next into drm-intel-next-queued
Need MST sideband message transaction to power up/down nodes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/media/platform/davinci/vpif_display.c')
| -rw-r--r-- | drivers/media/platform/davinci/vpif_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index bf982bf86542..56fe4e5b396e 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -290,7 +290,7 @@ static void vpif_stop_streaming(struct vb2_queue *vq) spin_unlock_irqrestore(&common->irqlock, flags); } -static struct vb2_ops video_qops = { +static const struct vb2_ops video_qops = { .queue_setup = vpif_buffer_queue_setup, .wait_prepare = vb2_ops_wait_prepare, .wait_finish = vb2_ops_wait_finish, |
