From 298d22737fac3dd55fd2df68c73fc045a523efaa Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 24 Jun 2011 13:14:14 -0300
Subject: [PATCH] --- yaml --- r: 261351 b: refs/heads/master c:
 ae6db5154671759426046c2cbc2e20a82ff0feed h: refs/heads/master i:   261349:
 3c87011f4267da8e00c327cc0768a687f98b2a70   261347:
 57ea42fcc0240dd5d59760b4e8111c8e95ec6e1f   261343:
 8b1db93e487c265d2e554ba52ab05c802d21c773 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/v4l2-ioctl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9bd68771a03b..20155d9e5605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6dc1bab052891f7cbe158f7146a0f9d55806471
+refs/heads/master: ae6db5154671759426046c2cbc2e20a82ff0feed
diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c
index 55df1436f835..48b94fcb6a25 100644
--- a/trunk/drivers/media/video/v4l2-ioctl.c
+++ b/trunk/drivers/media/video/v4l2-ioctl.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/version.h>
 
 #include <linux/videodev2.h>
 
@@ -605,6 +606,7 @@ static long __video_do_ioctl(struct file *file,
 		if (!ops->vidioc_querycap)
 			break;
 
+		cap->version = LINUX_VERSION_CODE;
 		ret = ops->vidioc_querycap(file, fh, cap);
 		if (!ret)
 			dbgarg(cmd, "driver=%s, card=%s, bus=%s, "