From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCHv2 06/13] [media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
Date: Mon, 27 Jun 2011 23:17:28 -0300 [thread overview]
Message-ID: <20110627231728.2e895fa7@pedra> (raw)
In-Reply-To: <cover.1309226359.git.mchehab@redhat.com>
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>
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index bf66189..14bb907 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -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>
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index a982750..d7efb33 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -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,
};
--
1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: unlisted-recipients:; (no To-header on input)@casper.infradead.org
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCHv2 06/13] [media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
Date: Mon, 27 Jun 2011 23:17:28 -0300 [thread overview]
Message-ID: <20110627231728.2e895fa7@pedra> (raw)
In-Reply-To: <cover.1309226359.git.mchehab@redhat.com>
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>
diff --git a/drivers/media/video/et61x251/et61x251.h b/drivers/media/video/et61x251/et61x251.h
index bf66189..14bb907 100644
--- a/drivers/media/video/et61x251/et61x251.h
+++ b/drivers/media/video/et61x251/et61x251.h
@@ -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>
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index a982750..d7efb33 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -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,
};
--
1.7.1
next prev parent reply other threads:[~2011-06-28 16:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1309226359.git.mchehab@redhat.com>
2011-06-28 2:17 ` [PATCHv2 01/13] [media] v4l2-ioctl: Add a default value for kernel version Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 03/13] [media] Stop using linux/version.h on most video drivers Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 04/13] [media] pwc: Use the default version for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 12/13] [media] radio: Use the subsystem version control " Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 02/13] [media] drxd, siano: Remove unused include linux/version.h Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 05/13] [media] ivtv,cx18: Use default version control for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 11/13] [media] Stop using linux/version.h the remaining video drivers Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab [this message]
2011-06-28 2:17 ` [PATCHv2 06/13] [media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 07/13] [media] pvrusb2: " Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 08/13] [media] sn9c102: " Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 09/13] [media] uvcvideo: " Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 13/13] [media] DocBook/v4l: Document the new system-wide version behavior Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 2:17 ` [PATCHv2 10/13] [media] gspca: don't include linux/version.h Mauro Carvalho Chehab
2011-06-28 2:17 ` Mauro Carvalho Chehab
2011-06-28 18:27 ` Jean-Francois Moine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110627231728.2e895fa7@pedra \
--to=mchehab@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.