Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / drivers / media / platform / mx2_emmaprp.c

diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 2236315778c3828c5387c0632d743c9c0773ae54..8f22ce543cf704315399b751371d79f8dfbd2c6e 100644 (file)
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -877,6 +877,7 @@ static struct video_device emmaprp_videodev = {
        .ioctl_ops      = &emmaprp_ioctl_ops,
        .minor          = -1,
        .release        = video_device_release,
+       .vfl_dir        = VFL_DIR_M2M,
 };
 
 static struct v4l2_m2m_ops m2m_ops = {