diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 11:57:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:15 -0400 |
commit | 5204cebadd09c5bd7e4fc194b9dfaba9e40c0361 (patch) | |
tree | bbb65e7e7f4f39a44dca8133ffa792108101cdcc | |
parent | 3c2d464ee8a967ecb2d820ddec42ea431f8bf3b4 (diff) |
[media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
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>
-rw-r--r-- | drivers/media/video/et61x251/et61x251.h | 1 | ||||
-rw-r--r-- | drivers/media/video/et61x251/et61x251_core.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h index bf66189cb26d..14bb907d650e 100644 --- a/drivers/media/video/et61x251/et61x251.h +++ b/drivers/media/video/et61x251/et61x251.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef _ET61X251_H_ | 21 | #ifndef _ET61X251_H_ |
22 | #define _ET61X251_H_ | 22 | #define _ET61X251_H_ |
23 | 23 | ||
24 | #include <linux/version.h> | ||
25 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
26 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
27 | #include <media/v4l2-common.h> | 26 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c index a982750dcef1..d7efb332d4e3 100644 --- a/drivers/media/video/et61x251/et61x251_core.c +++ b/drivers/media/video/et61x251/et61x251_core.c | |||
@@ -18,6 +18,7 @@ | |||
18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * | 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * |
19 | ***************************************************************************/ | 19 | ***************************************************************************/ |
20 | 20 | ||
21 | #include <linux/version.h> | ||
21 | #include <linux/module.h> | 22 | #include <linux/module.h> |
22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
@@ -48,8 +49,7 @@ | |||
48 | #define ET61X251_MODULE_AUTHOR "(C) 2006-2007 Luca Risolia" | 49 | #define ET61X251_MODULE_AUTHOR "(C) 2006-2007 Luca Risolia" |
49 | #define ET61X251_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>" | 50 | #define ET61X251_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>" |
50 | #define ET61X251_MODULE_LICENSE "GPL" | 51 | #define ET61X251_MODULE_LICENSE "GPL" |
51 | #define ET61X251_MODULE_VERSION "1:1.09" | 52 | #define ET61X251_MODULE_VERSION "1.1.10" |
52 | #define ET61X251_MODULE_VERSION_CODE KERNEL_VERSION(1, 1, 9) | ||
53 | 53 | ||
54 | /*****************************************************************************/ | 54 | /*****************************************************************************/ |
55 | 55 | ||
@@ -1579,7 +1579,7 @@ et61x251_vidioc_querycap(struct et61x251_device* cam, void __user * arg) | |||
1579 | { | 1579 | { |
1580 | struct v4l2_capability cap = { | 1580 | struct v4l2_capability cap = { |
1581 | .driver = "et61x251", | 1581 | .driver = "et61x251", |
1582 | .version = ET61X251_MODULE_VERSION_CODE, | 1582 | .version = LINUX_VERSION_CODE, |
1583 | .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | | 1583 | .capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | |
1584 | V4L2_CAP_STREAMING, | 1584 | V4L2_CAP_STREAMING, |
1585 | }; | 1585 | }; |