diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 10:28:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:16 -0400 |
commit | 64dc3c1a906467d90c24913b0b38dd13d9378f4f (patch) | |
tree | 64153b6da4909a9612e95735f8f21267c594e4d0 /drivers/media/video/omap3isp | |
parent | b0eaab765794bf4fdf060c74b21c9851ba3c6907 (diff) |
[media] Stop using linux/version.h on the remaining video drivers
Standardize the remaining video drivers to return the API version
for the VIDIOC_QUERYCAP version, instead of a per-driver version.
Those drivers had the version updated more recently or are SoC
drivers. Even so, it doesn't sound a good idea to keep a per-driver
version control, so, let's use the per-subsystem version control
instead.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap3isp')
-rw-r--r-- | drivers/media/video/omap3isp/isp.c | 1 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispvideo.c | 1 | ||||
-rw-r--r-- | drivers/media/video/omap3isp/ispvideo.h | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c index 94b6ed89e195..5cea2bbd7014 100644 --- a/drivers/media/video/omap3isp/isp.c +++ b/drivers/media/video/omap3isp/isp.c | |||
@@ -2234,3 +2234,4 @@ module_exit(isp_cleanup); | |||
2234 | MODULE_AUTHOR("Nokia Corporation"); | 2234 | MODULE_AUTHOR("Nokia Corporation"); |
2235 | MODULE_DESCRIPTION("TI OMAP3 ISP driver"); | 2235 | MODULE_DESCRIPTION("TI OMAP3 ISP driver"); |
2236 | MODULE_LICENSE("GPL"); | 2236 | MODULE_LICENSE("GPL"); |
2237 | MODULE_VERSION(ISP_VIDEO_DRIVER_VERSION); | ||
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c index 9cd8f1aa567b..fd965adfd597 100644 --- a/drivers/media/video/omap3isp/ispvideo.c +++ b/drivers/media/video/omap3isp/ispvideo.c | |||
@@ -695,7 +695,6 @@ isp_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap) | |||
695 | strlcpy(cap->driver, ISP_VIDEO_DRIVER_NAME, sizeof(cap->driver)); | 695 | strlcpy(cap->driver, ISP_VIDEO_DRIVER_NAME, sizeof(cap->driver)); |
696 | strlcpy(cap->card, video->video.name, sizeof(cap->card)); | 696 | strlcpy(cap->card, video->video.name, sizeof(cap->card)); |
697 | strlcpy(cap->bus_info, "media", sizeof(cap->bus_info)); | 697 | strlcpy(cap->bus_info, "media", sizeof(cap->bus_info)); |
698 | cap->version = ISP_VIDEO_DRIVER_VERSION; | ||
699 | 698 | ||
700 | if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) | 699 | if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) |
701 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; | 700 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; |
diff --git a/drivers/media/video/omap3isp/ispvideo.h b/drivers/media/video/omap3isp/ispvideo.h index 911bea64e78a..53160aa24e6e 100644 --- a/drivers/media/video/omap3isp/ispvideo.h +++ b/drivers/media/video/omap3isp/ispvideo.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #define OMAP3_ISP_VIDEO_H | 27 | #define OMAP3_ISP_VIDEO_H |
28 | 28 | ||
29 | #include <linux/v4l2-mediabus.h> | 29 | #include <linux/v4l2-mediabus.h> |
30 | #include <linux/version.h> | ||
31 | #include <media/media-entity.h> | 30 | #include <media/media-entity.h> |
32 | #include <media/v4l2-dev.h> | 31 | #include <media/v4l2-dev.h> |
33 | #include <media/v4l2-fh.h> | 32 | #include <media/v4l2-fh.h> |
@@ -35,7 +34,7 @@ | |||
35 | #include "ispqueue.h" | 34 | #include "ispqueue.h" |
36 | 35 | ||
37 | #define ISP_VIDEO_DRIVER_NAME "ispvideo" | 36 | #define ISP_VIDEO_DRIVER_NAME "ispvideo" |
38 | #define ISP_VIDEO_DRIVER_VERSION KERNEL_VERSION(0, 0, 1) | 37 | #define ISP_VIDEO_DRIVER_VERSION "0.0.2" |
39 | 38 | ||
40 | struct isp_device; | 39 | struct isp_device; |
41 | struct isp_video; | 40 | struct isp_video; |