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/pxa_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/pxa_camera.c')
-rw-r--r-- | drivers/media/video/pxa_camera.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index b42bfa5ccdf2..c5b27a4cda30 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
23 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
24 | #include <linux/time.h> | 24 | #include <linux/time.h> |
25 | #include <linux/version.h> | ||
26 | #include <linux/device.h> | 25 | #include <linux/device.h> |
27 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
28 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
@@ -40,7 +39,7 @@ | |||
40 | #include <mach/dma.h> | 39 | #include <mach/dma.h> |
41 | #include <mach/camera.h> | 40 | #include <mach/camera.h> |
42 | 41 | ||
43 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 42 | #define PXA_CAM_VERSION "0.0.6" |
44 | #define PXA_CAM_DRV_NAME "pxa27x-camera" | 43 | #define PXA_CAM_DRV_NAME "pxa27x-camera" |
45 | 44 | ||
46 | /* Camera Interface */ | 45 | /* Camera Interface */ |
@@ -1578,7 +1577,6 @@ static int pxa_camera_querycap(struct soc_camera_host *ici, | |||
1578 | { | 1577 | { |
1579 | /* cap->name is set by the firendly caller:-> */ | 1578 | /* cap->name is set by the firendly caller:-> */ |
1580 | strlcpy(cap->card, pxa_cam_driver_description, sizeof(cap->card)); | 1579 | strlcpy(cap->card, pxa_cam_driver_description, sizeof(cap->card)); |
1581 | cap->version = PXA_CAM_VERSION_CODE; | ||
1582 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; | 1580 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; |
1583 | 1581 | ||
1584 | return 0; | 1582 | return 0; |
@@ -1843,4 +1841,5 @@ module_exit(pxa_camera_exit); | |||
1843 | MODULE_DESCRIPTION("PXA27x SoC Camera Host driver"); | 1841 | MODULE_DESCRIPTION("PXA27x SoC Camera Host driver"); |
1844 | MODULE_AUTHOR("Guennadi Liakhovetski <kernel@pengutronix.de>"); | 1842 | MODULE_AUTHOR("Guennadi Liakhovetski <kernel@pengutronix.de>"); |
1845 | MODULE_LICENSE("GPL"); | 1843 | MODULE_LICENSE("GPL"); |
1844 | MODULE_VERSION(PXA_CAM_VERSION); | ||
1846 | MODULE_ALIAS("platform:" PXA_CAM_DRV_NAME); | 1845 | MODULE_ALIAS("platform:" PXA_CAM_DRV_NAME); |