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/mx2_camera.c | |
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/mx2_camera.c')
-rw-r--r-- | drivers/media/video/mx2_camera.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 4eab1c620318..e05e80090959 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
25 | #include <linux/time.h> | 25 | #include <linux/time.h> |
26 | #include <linux/version.h> | ||
27 | #include <linux/device.h> | 26 | #include <linux/device.h> |
28 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
29 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
@@ -47,7 +46,7 @@ | |||
47 | #include <asm/dma.h> | 46 | #include <asm/dma.h> |
48 | 47 | ||
49 | #define MX2_CAM_DRV_NAME "mx2-camera" | 48 | #define MX2_CAM_DRV_NAME "mx2-camera" |
50 | #define MX2_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 49 | #define MX2_CAM_VERSION "0.0.6" |
51 | #define MX2_CAM_DRIVER_DESCRIPTION "i.MX2x_Camera" | 50 | #define MX2_CAM_DRIVER_DESCRIPTION "i.MX2x_Camera" |
52 | 51 | ||
53 | /* reset values */ | 52 | /* reset values */ |
@@ -1014,7 +1013,6 @@ static int mx2_camera_querycap(struct soc_camera_host *ici, | |||
1014 | { | 1013 | { |
1015 | /* cap->name is set by the friendly caller:-> */ | 1014 | /* cap->name is set by the friendly caller:-> */ |
1016 | strlcpy(cap->card, MX2_CAM_DRIVER_DESCRIPTION, sizeof(cap->card)); | 1015 | strlcpy(cap->card, MX2_CAM_DRIVER_DESCRIPTION, sizeof(cap->card)); |
1017 | cap->version = MX2_CAM_VERSION_CODE; | ||
1018 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; | 1016 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; |
1019 | 1017 | ||
1020 | return 0; | 1018 | return 0; |
@@ -1523,3 +1521,4 @@ module_exit(mx2_camera_exit); | |||
1523 | MODULE_DESCRIPTION("i.MX27/i.MX25 SoC Camera Host driver"); | 1521 | MODULE_DESCRIPTION("i.MX27/i.MX25 SoC Camera Host driver"); |
1524 | MODULE_AUTHOR("Sascha Hauer <sha@pengutronix.de>"); | 1522 | MODULE_AUTHOR("Sascha Hauer <sha@pengutronix.de>"); |
1525 | MODULE_LICENSE("GPL"); | 1523 | MODULE_LICENSE("GPL"); |
1524 | MODULE_VERSION(MX2_CAM_VERSION); | ||