diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 12:34:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:15 -0400 |
commit | 083774d8b164b87c5595ead0b752236cfd5bf761 (patch) | |
tree | 527b10227af77134d24732d88d71cb35ff028a35 | |
parent | 5204cebadd09c5bd7e4fc194b9dfaba9e40c0361 (diff) |
[media] pvrusb2: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
pvrusb2 doesn't use vidioc_ioctl2. As the API is changing to use
a common version for all drivers, we need to expliticly fix this
driver.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-main.c | 1 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c index 2254194aad57..c1d9bb61cd77 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/drivers/media/video/pvrusb2/pvrusb2-main.c | |||
@@ -168,6 +168,7 @@ module_exit(pvr_exit); | |||
168 | MODULE_AUTHOR(DRIVER_AUTHOR); | 168 | MODULE_AUTHOR(DRIVER_AUTHOR); |
169 | MODULE_DESCRIPTION(DRIVER_DESC); | 169 | MODULE_DESCRIPTION(DRIVER_DESC); |
170 | MODULE_LICENSE("GPL"); | 170 | MODULE_LICENSE("GPL"); |
171 | MODULE_VERSION("0.9.1"); | ||
171 | 172 | ||
172 | 173 | ||
173 | /* | 174 | /* |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 38761142a4d9..573749ab96f5 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -91,7 +91,7 @@ static struct v4l2_capability pvr_capability ={ | |||
91 | .driver = "pvrusb2", | 91 | .driver = "pvrusb2", |
92 | .card = "Hauppauge WinTV pvr-usb2", | 92 | .card = "Hauppauge WinTV pvr-usb2", |
93 | .bus_info = "usb", | 93 | .bus_info = "usb", |
94 | .version = KERNEL_VERSION(0, 9, 0), | 94 | .version = LINUX_VERSION_CODE, |
95 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | | 95 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | |
96 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | | 96 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | |
97 | V4L2_CAP_READWRITE), | 97 | V4L2_CAP_READWRITE), |