]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
[media] tm6000: don't use KERNEL_VERSION
authorMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 19 Apr 2012 19:42:36 +0000 (16:42 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 19 Apr 2012 19:49:30 +0000 (16:49 -0300)
As reported by Marcos:
> The output of "make versioncheck" told us that:
>
> drivers/staging/media/easycap/easycap_ioctl.c: 2442: need linux/version.h

Now that drivers/media/video/v4l2-ioctl.c fills cap->version:
case VIDIOC_QUERYCAP:
{
struct v4l2_capability *cap = (struct v4l2_capability *)arg;

if (!ops->vidioc_querycap)
break;

cap->version = LINUX_VERSION_CODE;

V4L2 drivers that use video_ioctl2() shouldn't initialize it anymore.

Reported-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/tm6000/tm6000-video.c
drivers/media/video/tm6000/tm6000.h

index bc13db736e2457e7d89575b8b7c656f3e05a8ce7..1ba26d5b2ba6f1e51a4fa14c57f853a26d205c41 100644 (file)
@@ -889,7 +889,6 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
        strlcpy(cap->driver, "tm6000", sizeof(cap->driver));
        strlcpy(cap->card, "Trident TVMaster TM5600/6000/6010", sizeof(cap->card));
-       cap->version = TM6000_VERSION;
        cap->capabilities =     V4L2_CAP_VIDEO_CAPTURE |
                                V4L2_CAP_STREAMING     |
                                V4L2_CAP_AUDIO         |
index 27ba659cfa85610be14ecd957d5e11d9cdb775c0..6df418658c9cac977348cd19f60665e632b1c3d2 100644 (file)
@@ -33,8 +33,6 @@
 #include "dvb_frontend.h"
 #include "dmxdev.h"
 
-#define TM6000_VERSION KERNEL_VERSION(0, 0, 2)
-
 /* Inputs */
 enum tm6000_itype {
        TM6000_INPUT_TV = 1,