diff --git a/[refs] b/[refs] index 16170a21b7e9..1a52e702def0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b28d70176e9f05fb94256678b4ff5b3527e81b7f +refs/heads/master: 99b32b24889a4671244f4ef99fed779e017ce8be diff --git a/trunk/drivers/media/platform/fsl-viu.c b/trunk/drivers/media/platform/fsl-viu.c index 897250b88647..31ac4dc69247 100644 --- a/trunk/drivers/media/platform/fsl-viu.c +++ b/trunk/drivers/media/platform/fsl-viu.c @@ -864,7 +864,7 @@ int vidioc_s_fbuf(struct file *file, void *priv, const struct v4l2_framebuffer * { struct viu_fh *fh = priv; struct viu_dev *dev = fh->dev; - struct v4l2_framebuffer *fb = arg; + const struct v4l2_framebuffer *fb = arg; struct viu_fmt *fmt; if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RAWIO))