]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 25 Jun 2011 15:57:04 +0000 (12:57 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:53:15 +0000 (17:53 -0300)
et61x251 doesn't use vidioc_ioctl2. As the API is changing to use
a common version for all drivers, we need to expliticly fix this
driver.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/et61x251/et61x251.h
drivers/media/video/et61x251/et61x251_core.c

index bf66189cb26de1fba4f58884e458b89adb08d2b7..14bb907d650e123b4fe2be6a2366c5618f596f82 100644 (file)
@@ -21,7 +21,6 @@
 #ifndef _ET61X251_H_
 #define _ET61X251_H_
 
-#include <linux/version.h>
 #include <linux/usb.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
index a982750dcef10ad0d73f36be93246c4e1051a80b..d7efb332d4e322cb4bc1419aab60ceaa576f7393 100644 (file)
@@ -18,6 +18,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.               *
  ***************************************************************************/
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -48,8 +49,7 @@
 #define ET61X251_MODULE_AUTHOR  "(C) 2006-2007 Luca Risolia"
 #define ET61X251_AUTHOR_EMAIL   "<luca.risolia@studio.unibo.it>"
 #define ET61X251_MODULE_LICENSE "GPL"
-#define ET61X251_MODULE_VERSION "1:1.09"
-#define ET61X251_MODULE_VERSION_CODE  KERNEL_VERSION(1, 1, 9)
+#define ET61X251_MODULE_VERSION "1.1.10"
 
 /*****************************************************************************/
 
@@ -1579,7 +1579,7 @@ et61x251_vidioc_querycap(struct et61x251_device* cam, void __user * arg)
 {
        struct v4l2_capability cap = {
                .driver = "et61x251",
-               .version = ET61X251_MODULE_VERSION_CODE,
+               .version = LINUX_VERSION_CODE,
                .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
                                V4L2_CAP_STREAMING,
        };