aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap24xxcam.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-06-25 10:28:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:16 -0400
commit64dc3c1a906467d90c24913b0b38dd13d9378f4f (patch)
tree64153b6da4909a9612e95735f8f21267c594e4d0 /drivers/media/video/omap24xxcam.c
parentb0eaab765794bf4fdf060c74b21c9851ba3c6907 (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/omap24xxcam.c')
-rw-r--r--drivers/media/video/omap24xxcam.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index f6626e87dbc5..ba3a8af76a8c 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -31,7 +31,6 @@
31#include <linux/interrupt.h> 31#include <linux/interrupt.h>
32#include <linux/videodev2.h> 32#include <linux/videodev2.h>
33#include <linux/pci.h> /* needed for videobufs */ 33#include <linux/pci.h> /* needed for videobufs */
34#include <linux/version.h>
35#include <linux/platform_device.h> 34#include <linux/platform_device.h>
36#include <linux/clk.h> 35#include <linux/clk.h>
37#include <linux/io.h> 36#include <linux/io.h>
@@ -43,7 +42,7 @@
43 42
44#include "omap24xxcam.h" 43#include "omap24xxcam.h"
45 44
46#define OMAP24XXCAM_VERSION KERNEL_VERSION(0, 0, 0) 45#define OMAP24XXCAM_VERSION "0.0.1"
47 46
48#define RESET_TIMEOUT_NS 10000 47#define RESET_TIMEOUT_NS 10000
49 48
@@ -993,7 +992,6 @@ static int vidioc_querycap(struct file *file, void *fh,
993 992
994 strlcpy(cap->driver, CAM_NAME, sizeof(cap->driver)); 993 strlcpy(cap->driver, CAM_NAME, sizeof(cap->driver));
995 strlcpy(cap->card, cam->vfd->name, sizeof(cap->card)); 994 strlcpy(cap->card, cam->vfd->name, sizeof(cap->card));
996 cap->version = OMAP24XXCAM_VERSION;
997 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 995 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
998 996
999 return 0; 997 return 0;
@@ -1889,6 +1887,7 @@ static void __exit omap24xxcam_cleanup(void)
1889MODULE_AUTHOR("Sakari Ailus <sakari.ailus@nokia.com>"); 1887MODULE_AUTHOR("Sakari Ailus <sakari.ailus@nokia.com>");
1890MODULE_DESCRIPTION("OMAP24xx Video for Linux camera driver"); 1888MODULE_DESCRIPTION("OMAP24xx Video for Linux camera driver");
1891MODULE_LICENSE("GPL"); 1889MODULE_LICENSE("GPL");
1890MODULE_VERSION(OMAP24XXCAM_VERSION);
1892module_param(video_nr, int, 0); 1891module_param(video_nr, int, 0);
1893MODULE_PARM_DESC(video_nr, 1892MODULE_PARM_DESC(video_nr,
1894 "Minor number for video device (-1 ==> auto assign)"); 1893 "Minor number for video device (-1 ==> auto assign)");