diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-19 15:42:36 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-19 15:49:30 -0400 |
commit | f26cede16514eb78f8f01a30b5e8e016d246b5cb (patch) | |
tree | 6eaa3c73a223a3dc59c5970d5f24e59ef94854fa | |
parent | d8a9c01484b258573587a52c3226bbdf6d11cda6 (diff) |
[media] tm6000: don't use KERNEL_VERSION
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>
-rw-r--r-- | drivers/media/video/tm6000/tm6000-video.c | 1 | ||||
-rw-r--r-- | drivers/media/video/tm6000/tm6000.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/tm6000/tm6000-video.c b/drivers/media/video/tm6000/tm6000-video.c index bc13db736e24..1ba26d5b2ba6 100644 --- a/drivers/media/video/tm6000/tm6000-video.c +++ b/drivers/media/video/tm6000/tm6000-video.c | |||
@@ -889,7 +889,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
889 | 889 | ||
890 | strlcpy(cap->driver, "tm6000", sizeof(cap->driver)); | 890 | strlcpy(cap->driver, "tm6000", sizeof(cap->driver)); |
891 | strlcpy(cap->card, "Trident TVMaster TM5600/6000/6010", sizeof(cap->card)); | 891 | strlcpy(cap->card, "Trident TVMaster TM5600/6000/6010", sizeof(cap->card)); |
892 | cap->version = TM6000_VERSION; | ||
893 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | | 892 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | |
894 | V4L2_CAP_STREAMING | | 893 | V4L2_CAP_STREAMING | |
895 | V4L2_CAP_AUDIO | | 894 | V4L2_CAP_AUDIO | |
diff --git a/drivers/media/video/tm6000/tm6000.h b/drivers/media/video/tm6000/tm6000.h index 27ba659cfa85..6df418658c9c 100644 --- a/drivers/media/video/tm6000/tm6000.h +++ b/drivers/media/video/tm6000/tm6000.h | |||
@@ -33,8 +33,6 @@ | |||
33 | #include "dvb_frontend.h" | 33 | #include "dvb_frontend.h" |
34 | #include "dmxdev.h" | 34 | #include "dmxdev.h" |
35 | 35 | ||
36 | #define TM6000_VERSION KERNEL_VERSION(0, 0, 2) | ||
37 | |||
38 | /* Inputs */ | 36 | /* Inputs */ |
39 | enum tm6000_itype { | 37 | enum tm6000_itype { |
40 | TM6000_INPUT_TV = 1, | 38 | TM6000_INPUT_TV = 1, |