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: [PATCH 10/14] [media] sn9c102: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
Date: Sun, 26 Jun 2011 13:06:15 -0300 [thread overview]
Message-ID: <20110626130615.6291b917@pedra> (raw)
In-Reply-To: <cover.1309103285.git.mchehab@redhat.com>
sn9c102 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.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index cbfc444..22ea211 100644
--- a/drivers/media/video/sn9c102/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -21,7 +21,6 @@
#ifndef _SN9C102_H_
#define _SN9C102_H_
-#include <linux/version.h>
#include <linux/usb.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 44bf6c3..0729c65 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -33,6 +33,7 @@
#include <linux/stat.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
+#include <linux/version.h>
#include <linux/page-flags.h>
#include <asm/byteorder.h>
#include <asm/page.h>
@@ -47,8 +48,7 @@
#define SN9C102_MODULE_AUTHOR "(C) 2004-2007 Luca Risolia"
#define SN9C102_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>"
#define SN9C102_MODULE_LICENSE "GPL"
-#define SN9C102_MODULE_VERSION "1:1.47pre49"
-#define SN9C102_MODULE_VERSION_CODE KERNEL_VERSION(1, 1, 47)
+#define SN9C102_MODULE_VERSION "1:1.48"
/*****************************************************************************/
@@ -2158,7 +2158,7 @@ sn9c102_vidioc_querycap(struct sn9c102_device* cam, void __user * arg)
{
struct v4l2_capability cap = {
.driver = "sn9c102",
- .version = SN9C102_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: [PATCH 10/14] [media] sn9c102: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
Date: Sun, 26 Jun 2011 13:06:15 -0300 [thread overview]
Message-ID: <20110626130615.6291b917@pedra> (raw)
In-Reply-To: <cover.1309103285.git.mchehab@redhat.com>
sn9c102 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.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/sn9c102/sn9c102.h b/drivers/media/video/sn9c102/sn9c102.h
index cbfc444..22ea211 100644
--- a/drivers/media/video/sn9c102/sn9c102.h
+++ b/drivers/media/video/sn9c102/sn9c102.h
@@ -21,7 +21,6 @@
#ifndef _SN9C102_H_
#define _SN9C102_H_
-#include <linux/version.h>
#include <linux/usb.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 44bf6c3..0729c65 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -33,6 +33,7 @@
#include <linux/stat.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
+#include <linux/version.h>
#include <linux/page-flags.h>
#include <asm/byteorder.h>
#include <asm/page.h>
@@ -47,8 +48,7 @@
#define SN9C102_MODULE_AUTHOR "(C) 2004-2007 Luca Risolia"
#define SN9C102_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>"
#define SN9C102_MODULE_LICENSE "GPL"
-#define SN9C102_MODULE_VERSION "1:1.47pre49"
-#define SN9C102_MODULE_VERSION_CODE KERNEL_VERSION(1, 1, 47)
+#define SN9C102_MODULE_VERSION "1:1.48"
/*****************************************************************************/
@@ -2158,7 +2158,7 @@ sn9c102_vidioc_querycap(struct sn9c102_device* cam, void __user * arg)
{
struct v4l2_capability cap = {
.driver = "sn9c102",
- .version = SN9C102_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-26 16:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1309103285.git.mchehab@redhat.com>
2011-06-26 16:06 ` [PATCH 03/14] [media] v4l2-ioctl: Add a default value for kernel version Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 05/14] [media] Stop using linux/version.h on most video drivers Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 01/14] [media] v4l2 core: return -ENOIOCTLCMD if an ioctl doesn't exist Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-27 2:49 ` Linus Torvalds
2011-06-26 16:06 ` [PATCH 13/14] [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 06/14] [media] pwc: Use the default version " Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 04/14] [media] drxd, siano: Remove unused include linux/version.h Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 07/14] [media] ivtv,cx18: Use default version control for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 12/14] [media] Stop using linux/version.h the remaining video drivers Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 08/14] [media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 09/14] [media] pvrusb2: " Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab [this message]
2011-06-26 16:06 ` [PATCH 10/14] [media] sn9c102: " Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 11/14] [media] uvcvideo: " Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-27 1:14 ` Laurent Pinchart
2011-06-26 16:06 ` [PATCH 14/14] [media] DocBook/v4l: Document the new system-wide version behavior Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 02/14] [media] return -ENOIOCTLCMD for unsupported ioctl's at legacy drivers Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab
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=20110626130615.6291b917@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.