Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / mxb.c

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index e8846a09b0266863d34e444b8cc69d980dc8d5a5..0b38500235055bc176ebbc444f277a276c3b00d5 100644 (file)
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -643,7 +643,8 @@ static int vidioc_s_register(struct file *file, void *fh, struct v4l2_dbg_regist
 }
 #endif
 
-static long vidioc_default(struct file *file, void *fh, int cmd, void *arg)
+static long vidioc_default(struct file *file, void *fh, bool valid_prio,
+                                                       int cmd, void *arg)
 {
        struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
        struct mxb *mxb = (struct mxb *)dev->ext_priv;