diff --git a/[refs] b/[refs] index 71ae4af5ce2b..7063b8706a80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b86755f57bd2cc92d05ba3a613ab6ff44f09980 +refs/heads/master: cf8267ff100dd8466fe631f7172969945b654e3f diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 1db067c02815..0e623179f8a5 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -1182,6 +1182,7 @@ static const struct file_operations vivi_fops = { .read = vivi_read, .poll = vivi_poll, .ioctl = video_ioctl2, /* V4L2 ioctl handler */ + .compat_ioctl = v4l_compat_ioctl32, .mmap = vivi_mmap, .llseek = no_llseek, };