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/dsbr100.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/dsbr100.c')
-rw-r--r-- | drivers/media/radio/dsbr100.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 3d8cc425fa6b..25e58cbf35f0 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c | |||
@@ -102,10 +102,7 @@ | |||
102 | /* | 102 | /* |
103 | * Version Information | 103 | * Version Information |
104 | */ | 104 | */ |
105 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 105 | #define DRIVER_VERSION "0.4.7" |
106 | |||
107 | #define DRIVER_VERSION "v0.46" | ||
108 | #define RADIO_VERSION KERNEL_VERSION(0, 4, 6) | ||
109 | 106 | ||
110 | #define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>" | 107 | #define DRIVER_AUTHOR "Markus Demleitner <msdemlei@tucana.harvard.edu>" |
111 | #define DRIVER_DESC "D-Link DSB-R100 USB FM radio driver" | 108 | #define DRIVER_DESC "D-Link DSB-R100 USB FM radio driver" |
@@ -335,7 +332,6 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
335 | strlcpy(v->driver, "dsbr100", sizeof(v->driver)); | 332 | strlcpy(v->driver, "dsbr100", sizeof(v->driver)); |
336 | strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card)); | 333 | strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card)); |
337 | usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); | 334 | usb_make_path(radio->usbdev, v->bus_info, sizeof(v->bus_info)); |
338 | v->version = RADIO_VERSION; | ||
339 | v->capabilities = V4L2_CAP_TUNER; | 335 | v->capabilities = V4L2_CAP_TUNER; |
340 | return 0; | 336 | return 0; |
341 | } | 337 | } |
@@ -647,3 +643,4 @@ module_exit (dsbr100_exit); | |||
647 | MODULE_AUTHOR( DRIVER_AUTHOR ); | 643 | MODULE_AUTHOR( DRIVER_AUTHOR ); |
648 | MODULE_DESCRIPTION( DRIVER_DESC ); | 644 | MODULE_DESCRIPTION( DRIVER_DESC ); |
649 | MODULE_LICENSE("GPL"); | 645 | MODULE_LICENSE("GPL"); |
646 | MODULE_VERSION(DRIVER_VERSION); | ||