diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-06-25 09:15:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:16 -0400 |
commit | 29834c1ac7589c72996c5d02349d63fd397ef131 (patch) | |
tree | 60d5bfadc2bc4f88938640a6d11ff0983b5f5fd4 /drivers/media/radio/radio-mr800.c | |
parent | 64dc3c1a906467d90c24913b0b38dd13d9378f4f (diff) |
[media] radio: Use the subsystem version control for VIDIOC_QUERYCAP
Just like the video drivers, the right thing to do is to use
the per-subsystem version control.
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-mr800.c')
-rw-r--r-- | drivers/media/radio/radio-mr800.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index b3a635b95820..1742bd8110bd 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
@@ -63,18 +63,17 @@ | |||
63 | #include <media/v4l2-device.h> | 63 | #include <media/v4l2-device.h> |
64 | #include <media/v4l2-ioctl.h> | 64 | #include <media/v4l2-ioctl.h> |
65 | #include <linux/usb.h> | 65 | #include <linux/usb.h> |
66 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | ||
67 | #include <linux/mutex.h> | 66 | #include <linux/mutex.h> |
68 | 67 | ||
69 | /* driver and module definitions */ | 68 | /* driver and module definitions */ |
70 | #define DRIVER_AUTHOR "Alexey Klimov <klimov.linux@gmail.com>" | 69 | #define DRIVER_AUTHOR "Alexey Klimov <klimov.linux@gmail.com>" |
71 | #define DRIVER_DESC "AverMedia MR 800 USB FM radio driver" | 70 | #define DRIVER_DESC "AverMedia MR 800 USB FM radio driver" |
72 | #define DRIVER_VERSION "0.11" | 71 | #define DRIVER_VERSION "0.1.2" |
73 | #define RADIO_VERSION KERNEL_VERSION(0, 1, 1) | ||
74 | 72 | ||
75 | MODULE_AUTHOR(DRIVER_AUTHOR); | 73 | MODULE_AUTHOR(DRIVER_AUTHOR); |
76 | MODULE_DESCRIPTION(DRIVER_DESC); | 74 | MODULE_DESCRIPTION(DRIVER_DESC); |
77 | MODULE_LICENSE("GPL"); | 75 | MODULE_LICENSE("GPL"); |
76 | MODULE_VERSION(DRIVER_VERSION); | ||
78 | 77 | ||
79 | #define USB_AMRADIO_VENDOR 0x07ca | 78 | #define USB_AMRADIO_VENDOR 0x07ca |
80 | #define USB_AMRADIO_PRODUCT 0xb800 | 79 | #define USB_AMRADIO_PRODUCT 0xb800 |
@@ -301,7 +300,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
301 | strlcpy(v->driver, "radio-mr800", sizeof(v->driver)); | 300 | strlcpy(v->driver, "radio-mr800", sizeof(v->driver)); |
302 | strlcpy(v->card, "AverMedia MR 800 USB FM Radio", sizeof(v->card)); | 301 | strlcpy(v->card, "AverMedia MR 800 USB FM Radio", sizeof(v->card)); |
303 | usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); | 302 | usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); |
304 | v->version = RADIO_VERSION; | ||
305 | v->capabilities = V4L2_CAP_TUNER; | 303 | v->capabilities = V4L2_CAP_TUNER; |
306 | return 0; | 304 | return 0; |
307 | } | 305 | } |