aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/fsl-viu.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/fsl-viu.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/fsl-viu.c')
-rw-r--r--drivers/media/video/fsl-viu.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/video/fsl-viu.c b/drivers/media/video/fsl-viu.c
index 908d7012c3f2..27cb197d0bd6 100644
--- a/drivers/media/video/fsl-viu.c
+++ b/drivers/media/video/fsl-viu.c
@@ -23,19 +23,13 @@
23#include <linux/io.h> 23#include <linux/io.h>
24#include <linux/of_platform.h> 24#include <linux/of_platform.h>
25#include <linux/slab.h> 25#include <linux/slab.h>
26#include <linux/version.h>
27#include <media/v4l2-common.h> 26#include <media/v4l2-common.h>
28#include <media/v4l2-device.h> 27#include <media/v4l2-device.h>
29#include <media/v4l2-ioctl.h> 28#include <media/v4l2-ioctl.h>
30#include <media/videobuf-dma-contig.h> 29#include <media/videobuf-dma-contig.h>
31 30
32#define DRV_NAME "fsl_viu" 31#define DRV_NAME "fsl_viu"
33#define VIU_MAJOR_VERSION 0 32#define VIU_VERSION "0.5.1"
34#define VIU_MINOR_VERSION 5
35#define VIU_RELEASE 0
36#define VIU_VERSION KERNEL_VERSION(VIU_MAJOR_VERSION, \
37 VIU_MINOR_VERSION, \
38 VIU_RELEASE)
39 33
40#define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ 34#define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */
41 35
@@ -610,7 +604,6 @@ static int vidioc_querycap(struct file *file, void *priv,
610{ 604{
611 strcpy(cap->driver, "viu"); 605 strcpy(cap->driver, "viu");
612 strcpy(cap->card, "viu"); 606 strcpy(cap->card, "viu");
613 cap->version = VIU_VERSION;
614 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 607 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
615 V4L2_CAP_STREAMING | 608 V4L2_CAP_STREAMING |
616 V4L2_CAP_VIDEO_OVERLAY | 609 V4L2_CAP_VIDEO_OVERLAY |
@@ -1684,3 +1677,4 @@ module_exit(viu_exit);
1684MODULE_DESCRIPTION("Freescale Video-In(VIU)"); 1677MODULE_DESCRIPTION("Freescale Video-In(VIU)");
1685MODULE_AUTHOR("Hongjun Chen"); 1678MODULE_AUTHOR("Hongjun Chen");
1686MODULE_LICENSE("GPL"); 1679MODULE_LICENSE("GPL");
1680MODULE_VERSION(VIU_VERSION);