diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-24 13:45:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:12 -0400 |
commit | 1990d50b58bef127a647005fdcada6d07081d3ef (patch) | |
tree | 094d27aa88e25b9f48f505068147eeedf2a6d3df /drivers/media/video/vino.c | |
parent | d35ebf9558e692299b764163d61420fe5f526c02 (diff) |
[media] Stop using linux/version.h on most video drivers
All the modified drivers didn't have any version increment since
Jan, 1 2011. Several of them didn't have any version increment
for a long time, even having new features and important bug fixes
happening.
As we're now filling the QUERYCAP version with the current Kernel
Release, we don't need to maintain a per-driver version control
anymore. So, let's just use the default.
In order to preserve the Kernel module version history, a
KERNEL_VERSION() macro were added to all modified drivers, and
the extraver number were incremented.
I opted to preserve the per-driver version control to a few
pwc, pvrusb2, s2255, s5p-fimc and sh_vou.
A few drivers are still using the legacy way to handle ioctl's.
So, we can't do such change on them, otherwise, they'll break.
Those are: uvc, et61x251 and sn9c102.
The rationale is that the per-driver version control seems to be
actively maintained on those.
Yet, I think that the better for them would be to just use the
default version numbering, instead of doing that by themselves.
While here, removed a few uneeded include linux/version.h
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index d63e9d978493..52a0a3736c82 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
37 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
38 | #include <linux/time.h> | 38 | #include <linux/time.h> |
39 | #include <linux/version.h> | ||
40 | #include <linux/kmod.h> | 39 | #include <linux/kmod.h> |
41 | 40 | ||
42 | #include <linux/i2c.h> | 41 | #include <linux/i2c.h> |
@@ -61,8 +60,7 @@ | |||
61 | // #define VINO_DEBUG | 60 | // #define VINO_DEBUG |
62 | // #define VINO_DEBUG_INT | 61 | // #define VINO_DEBUG_INT |
63 | 62 | ||
64 | #define VINO_MODULE_VERSION "0.0.6" | 63 | #define VINO_MODULE_VERSION "0.0.7" |
65 | #define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 6) | ||
66 | 64 | ||
67 | MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver"); | 65 | MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver"); |
68 | MODULE_VERSION(VINO_MODULE_VERSION); | 66 | MODULE_VERSION(VINO_MODULE_VERSION); |
@@ -2934,7 +2932,6 @@ static int vino_querycap(struct file *file, void *__fh, | |||
2934 | strcpy(cap->driver, vino_driver_name); | 2932 | strcpy(cap->driver, vino_driver_name); |
2935 | strcpy(cap->card, vino_driver_description); | 2933 | strcpy(cap->card, vino_driver_description); |
2936 | strcpy(cap->bus_info, vino_bus_name); | 2934 | strcpy(cap->bus_info, vino_bus_name); |
2937 | cap->version = VINO_VERSION_CODE; | ||
2938 | cap->capabilities = | 2935 | cap->capabilities = |
2939 | V4L2_CAP_VIDEO_CAPTURE | | 2936 | V4L2_CAP_VIDEO_CAPTURE | |
2940 | V4L2_CAP_STREAMING; | 2937 | V4L2_CAP_STREAMING; |