aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/rcar_jpu.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-15 21:36:09 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-15 21:36:09 -0800
commitebfb0184ef560897fad35005989e82433419202c (patch)
tree226a8195fdae6c79d90d76baa1cbdaf80f794bb0 /drivers/media/platform/rcar_jpu.c
parentInput: imx6ul_tsc - generalize the averaging property (diff)
parentInput: synaptics-rmi4 - add support for F34 V7 bootloader (diff)
downloadlinux-dev-ebfb0184ef560897fad35005989e82433419202c.tar.xz
linux-dev-ebfb0184ef560897fad35005989e82433419202c.zip
Merge branch 'synaptics-rmi4' into next
Merge updated Synaptics RMI4 support, including support for SMBus controllers and flashing firmware.
Diffstat (limited to 'drivers/media/platform/rcar_jpu.c')
-rw-r--r--drivers/media/platform/rcar_jpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 16782ceb29c3..d1746ecc645d 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -1183,7 +1183,7 @@ static void jpu_stop_streaming(struct vb2_queue *vq)
}
}
-static struct vb2_ops jpu_qops = {
+static const struct vb2_ops jpu_qops = {
.queue_setup = jpu_queue_setup,
.buf_prepare = jpu_buf_prepare,
.buf_queue = jpu_buf_queue,