aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/radio/dsbr100.c7
-rw-r--r--drivers/media/radio/radio-aimslab.c5
-rw-r--r--drivers/media/radio/radio-aztech.c5
-rw-r--r--drivers/media/radio/radio-cadet.c5
-rw-r--r--drivers/media/radio/radio-gemtek.c7
-rw-r--r--drivers/media/radio/radio-maxiradio.c10
-rw-r--r--drivers/media/radio/radio-mr800.c6
-rw-r--r--drivers/media/radio/radio-rtrack2.c5
-rw-r--r--drivers/media/radio/radio-sf16fmi.c5
-rw-r--r--drivers/media/radio/radio-tea5764.c6
-rw-r--r--drivers/media/radio/radio-terratec.c5
-rw-r--r--drivers/media/radio/radio-timb.c3
-rw-r--r--drivers/media/radio/radio-trust.c5
-rw-r--r--drivers/media/radio/radio-typhoon.c9
-rw-r--r--drivers/media/radio/radio-zoltrix.c5
-rw-r--r--drivers/media/radio/si470x/radio-si470x-i2c.c4
-rw-r--r--drivers/media/radio/si470x/radio-si470x-usb.c2
-rw-r--r--drivers/media/radio/si470x/radio-si470x.h1
-rw-r--r--drivers/media/radio/wl128x/fmdrv.h5
-rw-r--r--drivers/media/radio/wl128x/fmdrv_v4l2.c1
20 files changed, 27 insertions, 74 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);
647MODULE_AUTHOR( DRIVER_AUTHOR ); 643MODULE_AUTHOR( DRIVER_AUTHOR );
648MODULE_DESCRIPTION( DRIVER_DESC ); 644MODULE_DESCRIPTION( DRIVER_DESC );
649MODULE_LICENSE("GPL"); 645MODULE_LICENSE("GPL");
646MODULE_VERSION(DRIVER_VERSION);
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 4ce10dbeadd8..1c3f8440a55c 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -33,7 +33,6 @@
33#include <linux/ioport.h> /* request_region */ 33#include <linux/ioport.h> /* request_region */
34#include <linux/delay.h> /* msleep */ 34#include <linux/delay.h> /* msleep */
35#include <linux/videodev2.h> /* kernel radio structs */ 35#include <linux/videodev2.h> /* kernel radio structs */
36#include <linux/version.h> /* for KERNEL_VERSION MACRO */
37#include <linux/io.h> /* outb, outb_p */ 36#include <linux/io.h> /* outb, outb_p */
38#include <media/v4l2-device.h> 37#include <media/v4l2-device.h>
39#include <media/v4l2-ioctl.h> 38#include <media/v4l2-ioctl.h>
@@ -41,6 +40,7 @@
41MODULE_AUTHOR("M.Kirkwood"); 40MODULE_AUTHOR("M.Kirkwood");
42MODULE_DESCRIPTION("A driver for the RadioTrack/RadioReveal radio card."); 41MODULE_DESCRIPTION("A driver for the RadioTrack/RadioReveal radio card.");
43MODULE_LICENSE("GPL"); 42MODULE_LICENSE("GPL");
43MODULE_VERSION("0.0.3");
44 44
45#ifndef CONFIG_RADIO_RTRACK_PORT 45#ifndef CONFIG_RADIO_RTRACK_PORT
46#define CONFIG_RADIO_RTRACK_PORT -1 46#define CONFIG_RADIO_RTRACK_PORT -1
@@ -53,8 +53,6 @@ module_param(io, int, 0);
53MODULE_PARM_DESC(io, "I/O address of the RadioTrack card (0x20f or 0x30f)"); 53MODULE_PARM_DESC(io, "I/O address of the RadioTrack card (0x20f or 0x30f)");
54module_param(radio_nr, int, 0); 54module_param(radio_nr, int, 0);
55 55
56#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
57
58struct rtrack 56struct rtrack
59{ 57{
60 struct v4l2_device v4l2_dev; 58 struct v4l2_device v4l2_dev;
@@ -223,7 +221,6 @@ static int vidioc_querycap(struct file *file, void *priv,
223 strlcpy(v->driver, "radio-aimslab", sizeof(v->driver)); 221 strlcpy(v->driver, "radio-aimslab", sizeof(v->driver));
224 strlcpy(v->card, "RadioTrack", sizeof(v->card)); 222 strlcpy(v->card, "RadioTrack", sizeof(v->card));
225 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 223 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
226 v->version = RADIO_VERSION;
227 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 224 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
228 return 0; 225 return 0;
229} 226}
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index dd8a6ab0d437..eed7b0840734 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -30,7 +30,6 @@
30#include <linux/ioport.h> /* request_region */ 30#include <linux/ioport.h> /* request_region */
31#include <linux/delay.h> /* udelay */ 31#include <linux/delay.h> /* udelay */
32#include <linux/videodev2.h> /* kernel radio structs */ 32#include <linux/videodev2.h> /* kernel radio structs */
33#include <linux/version.h> /* for KERNEL_VERSION MACRO */
34#include <linux/io.h> /* outb, outb_p */ 33#include <linux/io.h> /* outb, outb_p */
35#include <media/v4l2-device.h> 34#include <media/v4l2-device.h>
36#include <media/v4l2-ioctl.h> 35#include <media/v4l2-ioctl.h>
@@ -38,6 +37,7 @@
38MODULE_AUTHOR("Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath"); 37MODULE_AUTHOR("Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
39MODULE_DESCRIPTION("A driver for the Aztech radio card."); 38MODULE_DESCRIPTION("A driver for the Aztech radio card.");
40MODULE_LICENSE("GPL"); 39MODULE_LICENSE("GPL");
40MODULE_VERSION("0.0.3");
41 41
42/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ 42/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
43 43
@@ -53,8 +53,6 @@ module_param(io, int, 0);
53module_param(radio_nr, int, 0); 53module_param(radio_nr, int, 0);
54MODULE_PARM_DESC(io, "I/O address of the Aztech card (0x350 or 0x358)"); 54MODULE_PARM_DESC(io, "I/O address of the Aztech card (0x350 or 0x358)");
55 55
56#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
57
58struct aztech 56struct aztech
59{ 57{
60 struct v4l2_device v4l2_dev; 58 struct v4l2_device v4l2_dev;
@@ -188,7 +186,6 @@ static int vidioc_querycap(struct file *file, void *priv,
188 strlcpy(v->driver, "radio-aztech", sizeof(v->driver)); 186 strlcpy(v->driver, "radio-aztech", sizeof(v->driver));
189 strlcpy(v->card, "Aztech Radio", sizeof(v->card)); 187 strlcpy(v->card, "Aztech Radio", sizeof(v->card));
190 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 188 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
191 v->version = RADIO_VERSION;
192 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 189 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
193 return 0; 190 return 0;
194} 191}
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index bc9ad0897c55..16a089fad909 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -30,7 +30,6 @@
30 * Changed API to V4L2 30 * Changed API to V4L2
31 */ 31 */
32 32
33#include <linux/version.h>
34#include <linux/module.h> /* Modules */ 33#include <linux/module.h> /* Modules */
35#include <linux/init.h> /* Initdata */ 34#include <linux/init.h> /* Initdata */
36#include <linux/ioport.h> /* request_region */ 35#include <linux/ioport.h> /* request_region */
@@ -46,6 +45,7 @@
46MODULE_AUTHOR("Fred Gleason, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath"); 45MODULE_AUTHOR("Fred Gleason, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
47MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card."); 46MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card.");
48MODULE_LICENSE("GPL"); 47MODULE_LICENSE("GPL");
48MODULE_VERSION("0.3.4");
49 49
50static int io = -1; /* default to isapnp activation */ 50static int io = -1; /* default to isapnp activation */
51static int radio_nr = -1; 51static int radio_nr = -1;
@@ -54,8 +54,6 @@ module_param(io, int, 0);
54MODULE_PARM_DESC(io, "I/O address of Cadet card (0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e)"); 54MODULE_PARM_DESC(io, "I/O address of Cadet card (0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e)");
55module_param(radio_nr, int, 0); 55module_param(radio_nr, int, 0);
56 56
57#define CADET_VERSION KERNEL_VERSION(0, 3, 3)
58
59#define RDS_BUFFER 256 57#define RDS_BUFFER 256
60#define RDS_RX_FLAG 1 58#define RDS_RX_FLAG 1
61#define MBS_RX_FLAG 2 59#define MBS_RX_FLAG 2
@@ -361,7 +359,6 @@ static int vidioc_querycap(struct file *file, void *priv,
361 strlcpy(v->driver, "ADS Cadet", sizeof(v->driver)); 359 strlcpy(v->driver, "ADS Cadet", sizeof(v->driver));
362 strlcpy(v->card, "ADS Cadet", sizeof(v->card)); 360 strlcpy(v->card, "ADS Cadet", sizeof(v->card));
363 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 361 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
364 v->version = CADET_VERSION;
365 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO | 362 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO |
366 V4L2_CAP_READWRITE | V4L2_CAP_RDS_CAPTURE; 363 V4L2_CAP_READWRITE | V4L2_CAP_RDS_CAPTURE;
367 return 0; 364 return 0;
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 259936422e49..edadc8449a3d 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -21,21 +21,19 @@
21#include <linux/ioport.h> /* request_region */ 21#include <linux/ioport.h> /* request_region */
22#include <linux/delay.h> /* udelay */ 22#include <linux/delay.h> /* udelay */
23#include <linux/videodev2.h> /* kernel radio structs */ 23#include <linux/videodev2.h> /* kernel radio structs */
24#include <linux/version.h> /* for KERNEL_VERSION MACRO */
25#include <linux/mutex.h> 24#include <linux/mutex.h>
26#include <linux/io.h> /* outb, outb_p */ 25#include <linux/io.h> /* outb, outb_p */
27#include <media/v4l2-ioctl.h> 26#include <media/v4l2-ioctl.h>
28#include <media/v4l2-device.h> 27#include <media/v4l2-device.h>
29 28
30#define RADIO_VERSION KERNEL_VERSION(0, 0, 3)
31
32/* 29/*
33 * Module info. 30 * Module info.
34 */ 31 */
35 32
36MODULE_AUTHOR("Jonas Munsin, Pekka Seppänen <pexu@kapsi.fi>"); 33MODULE_AUTHOR("Jonas Munsin, Pekka Seppänen <pexu@kapsi.fi>");
37MODULE_DESCRIPTION("A driver for the GemTek Radio card."); 34MODULE_DESCRIPTION("A driver for the GemTek Radio card.");
38MODULE_LICENSE("GPL"); 35MODULE_LICENSE("GPL");
36MODULE_VERSION("0.0.4");
39 37
40/* 38/*
41 * Module params. 39 * Module params.
@@ -387,7 +385,6 @@ static int vidioc_querycap(struct file *file, void *priv,
387 strlcpy(v->driver, "radio-gemtek", sizeof(v->driver)); 385 strlcpy(v->driver, "radio-gemtek", sizeof(v->driver));
388 strlcpy(v->card, "GemTek", sizeof(v->card)); 386 strlcpy(v->card, "GemTek", sizeof(v->card));
389 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 387 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
390 v->version = RADIO_VERSION;
391 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 388 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
392 return 0; 389 return 0;
393} 390}
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index e83e84003025..f872a54cf3d9 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -40,15 +40,18 @@
40#include <linux/mutex.h> 40#include <linux/mutex.h>
41#include <linux/pci.h> 41#include <linux/pci.h>
42#include <linux/videodev2.h> 42#include <linux/videodev2.h>
43#include <linux/version.h> /* for KERNEL_VERSION MACRO */
44#include <linux/io.h> 43#include <linux/io.h>
45#include <linux/slab.h> 44#include <linux/slab.h>
46#include <media/v4l2-device.h> 45#include <media/v4l2-device.h>
47#include <media/v4l2-ioctl.h> 46#include <media/v4l2-ioctl.h>
48 47
48#define DRIVER_VERSION "0.7.8"
49
50
49MODULE_AUTHOR("Dimitromanolakis Apostolos, apdim@grecian.net"); 51MODULE_AUTHOR("Dimitromanolakis Apostolos, apdim@grecian.net");
50MODULE_DESCRIPTION("Radio driver for the Guillemot Maxi Radio FM2000 radio."); 52MODULE_DESCRIPTION("Radio driver for the Guillemot Maxi Radio FM2000 radio.");
51MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
54MODULE_VERSION(DRIVER_VERSION);
52 55
53static int radio_nr = -1; 56static int radio_nr = -1;
54module_param(radio_nr, int, 0); 57module_param(radio_nr, int, 0);
@@ -58,10 +61,6 @@ static int debug;
58module_param(debug, int, 0644); 61module_param(debug, int, 0644);
59MODULE_PARM_DESC(debug, "activates debug info"); 62MODULE_PARM_DESC(debug, "activates debug info");
60 63
61#define DRIVER_VERSION "0.77"
62
63#define RADIO_VERSION KERNEL_VERSION(0, 7, 7)
64
65#define dprintk(dev, num, fmt, arg...) \ 64#define dprintk(dev, num, fmt, arg...) \
66 v4l2_dbg(num, debug, &dev->v4l2_dev, fmt, ## arg) 65 v4l2_dbg(num, debug, &dev->v4l2_dev, fmt, ## arg)
67 66
@@ -195,7 +194,6 @@ static int vidioc_querycap(struct file *file, void *priv,
195 strlcpy(v->driver, "radio-maxiradio", sizeof(v->driver)); 194 strlcpy(v->driver, "radio-maxiradio", sizeof(v->driver));
196 strlcpy(v->card, "Maxi Radio FM2000 radio", sizeof(v->card)); 195 strlcpy(v->card, "Maxi Radio FM2000 radio", sizeof(v->card));
197 snprintf(v->bus_info, sizeof(v->bus_info), "PCI:%s", pci_name(dev->pdev)); 196 snprintf(v->bus_info, sizeof(v->bus_info), "PCI:%s", pci_name(dev->pdev));
198 v->version = RADIO_VERSION;
199 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 197 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
200 return 0; 198 return 0;
201} 199}
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
75MODULE_AUTHOR(DRIVER_AUTHOR); 73MODULE_AUTHOR(DRIVER_AUTHOR);
76MODULE_DESCRIPTION(DRIVER_DESC); 74MODULE_DESCRIPTION(DRIVER_DESC);
77MODULE_LICENSE("GPL"); 75MODULE_LICENSE("GPL");
76MODULE_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}
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 8d6ea591bd18..3628be617ee9 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -15,7 +15,6 @@
15#include <linux/delay.h> /* udelay */ 15#include <linux/delay.h> /* udelay */
16#include <linux/videodev2.h> /* kernel radio structs */ 16#include <linux/videodev2.h> /* kernel radio structs */
17#include <linux/mutex.h> 17#include <linux/mutex.h>
18#include <linux/version.h> /* for KERNEL_VERSION MACRO */
19#include <linux/io.h> /* outb, outb_p */ 18#include <linux/io.h> /* outb, outb_p */
20#include <media/v4l2-device.h> 19#include <media/v4l2-device.h>
21#include <media/v4l2-ioctl.h> 20#include <media/v4l2-ioctl.h>
@@ -23,6 +22,7 @@
23MODULE_AUTHOR("Ben Pfaff"); 22MODULE_AUTHOR("Ben Pfaff");
24MODULE_DESCRIPTION("A driver for the RadioTrack II radio card."); 23MODULE_DESCRIPTION("A driver for the RadioTrack II radio card.");
25MODULE_LICENSE("GPL"); 24MODULE_LICENSE("GPL");
25MODULE_VERSION("0.0.3");
26 26
27#ifndef CONFIG_RADIO_RTRACK2_PORT 27#ifndef CONFIG_RADIO_RTRACK2_PORT
28#define CONFIG_RADIO_RTRACK2_PORT -1 28#define CONFIG_RADIO_RTRACK2_PORT -1
@@ -35,8 +35,6 @@ module_param(io, int, 0);
35MODULE_PARM_DESC(io, "I/O address of the RadioTrack card (0x20c or 0x30c)"); 35MODULE_PARM_DESC(io, "I/O address of the RadioTrack card (0x20c or 0x30c)");
36module_param(radio_nr, int, 0); 36module_param(radio_nr, int, 0);
37 37
38#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
39
40struct rtrack2 38struct rtrack2
41{ 39{
42 struct v4l2_device v4l2_dev; 40 struct v4l2_device v4l2_dev;
@@ -121,7 +119,6 @@ static int vidioc_querycap(struct file *file, void *priv,
121 strlcpy(v->driver, "radio-rtrack2", sizeof(v->driver)); 119 strlcpy(v->driver, "radio-rtrack2", sizeof(v->driver));
122 strlcpy(v->card, "RadioTrack II", sizeof(v->card)); 120 strlcpy(v->card, "RadioTrack II", sizeof(v->card));
123 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 121 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
124 v->version = RADIO_VERSION;
125 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 122 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
126 return 0; 123 return 0;
127} 124}
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index b5a5f89e238a..22c5743bf9db 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -16,7 +16,6 @@
16 * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org> 16 * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org>
17 */ 17 */
18 18
19#include <linux/version.h>
20#include <linux/kernel.h> /* __setup */ 19#include <linux/kernel.h> /* __setup */
21#include <linux/module.h> /* Modules */ 20#include <linux/module.h> /* Modules */
22#include <linux/init.h> /* Initdata */ 21#include <linux/init.h> /* Initdata */
@@ -32,6 +31,7 @@
32MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood"); 31MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
33MODULE_DESCRIPTION("A driver for the SF16-FMI and SF16-FMP radio."); 32MODULE_DESCRIPTION("A driver for the SF16-FMI and SF16-FMP radio.");
34MODULE_LICENSE("GPL"); 33MODULE_LICENSE("GPL");
34MODULE_VERSION("0.0.3");
35 35
36static int io = -1; 36static int io = -1;
37static int radio_nr = -1; 37static int radio_nr = -1;
@@ -40,8 +40,6 @@ module_param(io, int, 0);
40MODULE_PARM_DESC(io, "I/O address of the SF16-FMI or SF16-FMP card (0x284 or 0x384)"); 40MODULE_PARM_DESC(io, "I/O address of the SF16-FMI or SF16-FMP card (0x284 or 0x384)");
41module_param(radio_nr, int, 0); 41module_param(radio_nr, int, 0);
42 42
43#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
44
45struct fmi 43struct fmi
46{ 44{
47 struct v4l2_device v4l2_dev; 45 struct v4l2_device v4l2_dev;
@@ -134,7 +132,6 @@ static int vidioc_querycap(struct file *file, void *priv,
134 strlcpy(v->driver, "radio-sf16fmi", sizeof(v->driver)); 132 strlcpy(v->driver, "radio-sf16fmi", sizeof(v->driver));
135 strlcpy(v->card, "SF16-FMx radio", sizeof(v->card)); 133 strlcpy(v->card, "SF16-FMx radio", sizeof(v->card));
136 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 134 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
137 v->version = RADIO_VERSION;
138 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 135 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
139 return 0; 136 return 0;
140} 137}
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 0e71d816c725..ce75c3ae5670 100644
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -39,10 +39,8 @@
39#include <linux/i2c.h> /* I2C */ 39#include <linux/i2c.h> /* I2C */
40#include <media/v4l2-common.h> 40#include <media/v4l2-common.h>
41#include <media/v4l2-ioctl.h> 41#include <media/v4l2-ioctl.h>
42#include <linux/version.h> /* for KERNEL_VERSION MACRO */
43 42
44#define DRIVER_VERSION "v0.01" 43#define DRIVER_VERSION "0.0.2"
45#define RADIO_VERSION KERNEL_VERSION(0, 0, 1)
46 44
47#define DRIVER_AUTHOR "Fabio Belavenuto <belavenuto@gmail.com>" 45#define DRIVER_AUTHOR "Fabio Belavenuto <belavenuto@gmail.com>"
48#define DRIVER_DESC "A driver for the TEA5764 radio chip for EZX Phones." 46#define DRIVER_DESC "A driver for the TEA5764 radio chip for EZX Phones."
@@ -300,7 +298,6 @@ static int vidioc_querycap(struct file *file, void *priv,
300 strlcpy(v->card, dev->name, sizeof(v->card)); 298 strlcpy(v->card, dev->name, sizeof(v->card));
301 snprintf(v->bus_info, sizeof(v->bus_info), 299 snprintf(v->bus_info, sizeof(v->bus_info),
302 "I2C:%s", dev_name(&dev->dev)); 300 "I2C:%s", dev_name(&dev->dev));
303 v->version = RADIO_VERSION;
304 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 301 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
305 return 0; 302 return 0;
306} 303}
@@ -595,6 +592,7 @@ static void __exit tea5764_exit(void)
595MODULE_AUTHOR(DRIVER_AUTHOR); 592MODULE_AUTHOR(DRIVER_AUTHOR);
596MODULE_DESCRIPTION(DRIVER_DESC); 593MODULE_DESCRIPTION(DRIVER_DESC);
597MODULE_LICENSE("GPL"); 594MODULE_LICENSE("GPL");
595MODULE_VERSION(DRIVER_VERSION);
598 596
599module_param(use_xtal, int, 1); 597module_param(use_xtal, int, 1);
600MODULE_PARM_DESC(use_xtal, "Chip have a xtal connected in board"); 598MODULE_PARM_DESC(use_xtal, "Chip have a xtal connected in board");
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index a32663917059..f2ed9cc3cf3b 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -29,7 +29,6 @@
29#include <linux/ioport.h> /* request_region */ 29#include <linux/ioport.h> /* request_region */
30#include <linux/videodev2.h> /* kernel radio structs */ 30#include <linux/videodev2.h> /* kernel radio structs */
31#include <linux/mutex.h> 31#include <linux/mutex.h>
32#include <linux/version.h> /* for KERNEL_VERSION MACRO */
33#include <linux/io.h> /* outb, outb_p */ 32#include <linux/io.h> /* outb, outb_p */
34#include <media/v4l2-device.h> 33#include <media/v4l2-device.h>
35#include <media/v4l2-ioctl.h> 34#include <media/v4l2-ioctl.h>
@@ -37,6 +36,7 @@
37MODULE_AUTHOR("R.OFFERMANNS & others"); 36MODULE_AUTHOR("R.OFFERMANNS & others");
38MODULE_DESCRIPTION("A driver for the TerraTec ActiveRadio Standalone radio card."); 37MODULE_DESCRIPTION("A driver for the TerraTec ActiveRadio Standalone radio card.");
39MODULE_LICENSE("GPL"); 38MODULE_LICENSE("GPL");
39MODULE_VERSION("0.0.3");
40 40
41#ifndef CONFIG_RADIO_TERRATEC_PORT 41#ifndef CONFIG_RADIO_TERRATEC_PORT
42#define CONFIG_RADIO_TERRATEC_PORT 0x590 42#define CONFIG_RADIO_TERRATEC_PORT 0x590
@@ -49,8 +49,6 @@ module_param(io, int, 0);
49MODULE_PARM_DESC(io, "I/O address of the TerraTec ActiveRadio card (0x590 or 0x591)"); 49MODULE_PARM_DESC(io, "I/O address of the TerraTec ActiveRadio card (0x590 or 0x591)");
50module_param(radio_nr, int, 0); 50module_param(radio_nr, int, 0);
51 51
52#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
53
54static struct v4l2_queryctrl radio_qctrl[] = { 52static struct v4l2_queryctrl radio_qctrl[] = {
55 { 53 {
56 .id = V4L2_CID_AUDIO_MUTE, 54 .id = V4L2_CID_AUDIO_MUTE,
@@ -205,7 +203,6 @@ static int vidioc_querycap(struct file *file, void *priv,
205 strlcpy(v->driver, "radio-terratec", sizeof(v->driver)); 203 strlcpy(v->driver, "radio-terratec", sizeof(v->driver));
206 strlcpy(v->card, "ActiveRadio", sizeof(v->card)); 204 strlcpy(v->card, "ActiveRadio", sizeof(v->card));
207 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 205 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
208 v->version = RADIO_VERSION;
209 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 206 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
210 return 0; 207 return 0;
211} 208}
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index a185610b376b..f17b540d68a5 100644
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -16,7 +16,6 @@
16 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 16 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 */ 17 */
18 18
19#include <linux/version.h>
20#include <linux/io.h> 19#include <linux/io.h>
21#include <media/v4l2-ioctl.h> 20#include <media/v4l2-ioctl.h>
22#include <media/v4l2-device.h> 21#include <media/v4l2-device.h>
@@ -44,7 +43,6 @@ static int timbradio_vidioc_querycap(struct file *file, void *priv,
44 strlcpy(v->driver, DRIVER_NAME, sizeof(v->driver)); 43 strlcpy(v->driver, DRIVER_NAME, sizeof(v->driver));
45 strlcpy(v->card, "Timberdale Radio", sizeof(v->card)); 44 strlcpy(v->card, "Timberdale Radio", sizeof(v->card));
46 snprintf(v->bus_info, sizeof(v->bus_info), "platform:"DRIVER_NAME); 45 snprintf(v->bus_info, sizeof(v->bus_info), "platform:"DRIVER_NAME);
47 v->version = KERNEL_VERSION(0, 0, 1);
48 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 46 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
49 return 0; 47 return 0;
50} 48}
@@ -245,4 +243,5 @@ module_exit(timbradio_exit);
245MODULE_DESCRIPTION("Timberdale Radio driver"); 243MODULE_DESCRIPTION("Timberdale Radio driver");
246MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>"); 244MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
247MODULE_LICENSE("GPL v2"); 245MODULE_LICENSE("GPL v2");
246MODULE_VERSION("0.0.2");
248MODULE_ALIAS("platform:"DRIVER_NAME); 247MODULE_ALIAS("platform:"DRIVER_NAME);
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 22fa9cc28abe..b3f45a019d82 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -19,7 +19,6 @@
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/ioport.h> 21#include <linux/ioport.h>
22#include <linux/version.h> /* for KERNEL_VERSION MACRO */
23#include <linux/videodev2.h> 22#include <linux/videodev2.h>
24#include <linux/io.h> 23#include <linux/io.h>
25#include <media/v4l2-device.h> 24#include <media/v4l2-device.h>
@@ -28,6 +27,7 @@
28MODULE_AUTHOR("Eric Lammerts, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath"); 27MODULE_AUTHOR("Eric Lammerts, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
29MODULE_DESCRIPTION("A driver for the Trust FM Radio card."); 28MODULE_DESCRIPTION("A driver for the Trust FM Radio card.");
30MODULE_LICENSE("GPL"); 29MODULE_LICENSE("GPL");
30MODULE_VERSION("0.0.3");
31 31
32/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ 32/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
33 33
@@ -42,8 +42,6 @@ module_param(io, int, 0);
42MODULE_PARM_DESC(io, "I/O address of the Trust FM Radio card (0x350 or 0x358)"); 42MODULE_PARM_DESC(io, "I/O address of the Trust FM Radio card (0x350 or 0x358)");
43module_param(radio_nr, int, 0); 43module_param(radio_nr, int, 0);
44 44
45#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
46
47struct trust { 45struct trust {
48 struct v4l2_device v4l2_dev; 46 struct v4l2_device v4l2_dev;
49 struct video_device vdev; 47 struct video_device vdev;
@@ -196,7 +194,6 @@ static int vidioc_querycap(struct file *file, void *priv,
196 strlcpy(v->driver, "radio-trust", sizeof(v->driver)); 194 strlcpy(v->driver, "radio-trust", sizeof(v->driver));
197 strlcpy(v->card, "Trust FM Radio", sizeof(v->card)); 195 strlcpy(v->card, "Trust FM Radio", sizeof(v->card));
198 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 196 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
199 v->version = RADIO_VERSION;
200 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 197 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
201 return 0; 198 return 0;
202} 199}
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 8dbbf08f2207..398726abc0c8 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -31,15 +31,17 @@
31#include <linux/module.h> /* Modules */ 31#include <linux/module.h> /* Modules */
32#include <linux/init.h> /* Initdata */ 32#include <linux/init.h> /* Initdata */
33#include <linux/ioport.h> /* request_region */ 33#include <linux/ioport.h> /* request_region */
34#include <linux/version.h> /* for KERNEL_VERSION MACRO */
35#include <linux/videodev2.h> /* kernel radio structs */ 34#include <linux/videodev2.h> /* kernel radio structs */
36#include <linux/io.h> /* outb, outb_p */ 35#include <linux/io.h> /* outb, outb_p */
37#include <media/v4l2-device.h> 36#include <media/v4l2-device.h>
38#include <media/v4l2-ioctl.h> 37#include <media/v4l2-ioctl.h>
39 38
39#define DRIVER_VERSION "0.1.2"
40
40MODULE_AUTHOR("Dr. Henrik Seidel"); 41MODULE_AUTHOR("Dr. Henrik Seidel");
41MODULE_DESCRIPTION("A driver for the Typhoon radio card (a.k.a. EcoRadio)."); 42MODULE_DESCRIPTION("A driver for the Typhoon radio card (a.k.a. EcoRadio).");
42MODULE_LICENSE("GPL"); 43MODULE_LICENSE("GPL");
44MODULE_VERSION(DRIVER_VERSION);
43 45
44#ifndef CONFIG_RADIO_TYPHOON_PORT 46#ifndef CONFIG_RADIO_TYPHOON_PORT
45#define CONFIG_RADIO_TYPHOON_PORT -1 47#define CONFIG_RADIO_TYPHOON_PORT -1
@@ -61,9 +63,7 @@ static unsigned long mutefreq = CONFIG_RADIO_TYPHOON_MUTEFREQ;
61module_param(mutefreq, ulong, 0); 63module_param(mutefreq, ulong, 0);
62MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)"); 64MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)");
63 65
64#define RADIO_VERSION KERNEL_VERSION(0, 1, 1) 66#define BANNER "Typhoon Radio Card driver v" DRIVER_VERSION "\n"
65
66#define BANNER "Typhoon Radio Card driver v0.1.1\n"
67 67
68struct typhoon { 68struct typhoon {
69 struct v4l2_device v4l2_dev; 69 struct v4l2_device v4l2_dev;
@@ -171,7 +171,6 @@ static int vidioc_querycap(struct file *file, void *priv,
171 strlcpy(v->driver, "radio-typhoon", sizeof(v->driver)); 171 strlcpy(v->driver, "radio-typhoon", sizeof(v->driver));
172 strlcpy(v->card, "Typhoon Radio", sizeof(v->card)); 172 strlcpy(v->card, "Typhoon Radio", sizeof(v->card));
173 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 173 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
174 v->version = RADIO_VERSION;
175 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 174 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
176 return 0; 175 return 0;
177} 176}
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index af99c5bd88c1..f5613b948203 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -35,7 +35,6 @@
35#include <linux/delay.h> /* udelay, msleep */ 35#include <linux/delay.h> /* udelay, msleep */
36#include <linux/videodev2.h> /* kernel radio structs */ 36#include <linux/videodev2.h> /* kernel radio structs */
37#include <linux/mutex.h> 37#include <linux/mutex.h>
38#include <linux/version.h> /* for KERNEL_VERSION MACRO */
39#include <linux/io.h> /* outb, outb_p */ 38#include <linux/io.h> /* outb, outb_p */
40#include <media/v4l2-device.h> 39#include <media/v4l2-device.h>
41#include <media/v4l2-ioctl.h> 40#include <media/v4l2-ioctl.h>
@@ -43,6 +42,7 @@
43MODULE_AUTHOR("C.van Schaik"); 42MODULE_AUTHOR("C.van Schaik");
44MODULE_DESCRIPTION("A driver for the Zoltrix Radio Plus."); 43MODULE_DESCRIPTION("A driver for the Zoltrix Radio Plus.");
45MODULE_LICENSE("GPL"); 44MODULE_LICENSE("GPL");
45MODULE_VERSION("0.0.3");
46 46
47#ifndef CONFIG_RADIO_ZOLTRIX_PORT 47#ifndef CONFIG_RADIO_ZOLTRIX_PORT
48#define CONFIG_RADIO_ZOLTRIX_PORT -1 48#define CONFIG_RADIO_ZOLTRIX_PORT -1
@@ -55,8 +55,6 @@ module_param(io, int, 0);
55MODULE_PARM_DESC(io, "I/O address of the Zoltrix Radio Plus (0x20c or 0x30c)"); 55MODULE_PARM_DESC(io, "I/O address of the Zoltrix Radio Plus (0x20c or 0x30c)");
56module_param(radio_nr, int, 0); 56module_param(radio_nr, int, 0);
57 57
58#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
59
60struct zoltrix { 58struct zoltrix {
61 struct v4l2_device v4l2_dev; 59 struct v4l2_device v4l2_dev;
62 struct video_device vdev; 60 struct video_device vdev;
@@ -228,7 +226,6 @@ static int vidioc_querycap(struct file *file, void *priv,
228 strlcpy(v->driver, "radio-zoltrix", sizeof(v->driver)); 226 strlcpy(v->driver, "radio-zoltrix", sizeof(v->driver));
229 strlcpy(v->card, "Zoltrix Radio", sizeof(v->card)); 227 strlcpy(v->card, "Zoltrix Radio", sizeof(v->card));
230 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); 228 strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
231 v->version = RADIO_VERSION;
232 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; 229 v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
233 return 0; 230 return 0;
234} 231}
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index a2a67772c42c..fd3541b0e91c 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -24,10 +24,9 @@
24 24
25/* driver definitions */ 25/* driver definitions */
26#define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>"; 26#define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>";
27#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 1)
28#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver" 27#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
29#define DRIVER_DESC "I2C radio driver for Si470x FM Radio Receivers" 28#define DRIVER_DESC "I2C radio driver for Si470x FM Radio Receivers"
30#define DRIVER_VERSION "1.0.1" 29#define DRIVER_VERSION "1.0.2"
31 30
32/* kernel includes */ 31/* kernel includes */
33#include <linux/i2c.h> 32#include <linux/i2c.h>
@@ -248,7 +247,6 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
248{ 247{
249 strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver)); 248 strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));
250 strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card)); 249 strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
251 capability->version = DRIVER_KERNEL_VERSION;
252 capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | 250 capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
253 V4L2_CAP_TUNER | V4L2_CAP_RADIO; 251 V4L2_CAP_TUNER | V4L2_CAP_RADIO;
254 252
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index ccefdaea4dc5..4cf537043f99 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -29,7 +29,6 @@
29 29
30/* driver definitions */ 30/* driver definitions */
31#define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>" 31#define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>"
32#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 10)
33#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver" 32#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
34#define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers" 33#define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers"
35#define DRIVER_VERSION "1.0.10" 34#define DRIVER_VERSION "1.0.10"
@@ -626,7 +625,6 @@ int si470x_vidioc_querycap(struct file *file, void *priv,
626 strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card)); 625 strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));
627 usb_make_path(radio->usbdev, capability->bus_info, 626 usb_make_path(radio->usbdev, capability->bus_info,
628 sizeof(capability->bus_info)); 627 sizeof(capability->bus_info));
629 capability->version = DRIVER_KERNEL_VERSION;
630 capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | 628 capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
631 V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE; 629 V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_RDS_CAPTURE;
632 630
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index 68da001b09dc..f300a55ed85c 100644
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -32,7 +32,6 @@
32#include <linux/sched.h> 32#include <linux/sched.h>
33#include <linux/slab.h> 33#include <linux/slab.h>
34#include <linux/input.h> 34#include <linux/input.h>
35#include <linux/version.h>
36#include <linux/videodev2.h> 35#include <linux/videodev2.h>
37#include <linux/mutex.h> 36#include <linux/mutex.h>
38#include <media/v4l2-common.h> 37#include <media/v4l2-common.h>
diff --git a/drivers/media/radio/wl128x/fmdrv.h b/drivers/media/radio/wl128x/fmdrv.h
index 1a45a5d847b0..d84ad9dad323 100644
--- a/drivers/media/radio/wl128x/fmdrv.h
+++ b/drivers/media/radio/wl128x/fmdrv.h
@@ -28,14 +28,11 @@
28#include <sound/core.h> 28#include <sound/core.h>
29#include <sound/initval.h> 29#include <sound/initval.h>
30#include <linux/timer.h> 30#include <linux/timer.h>
31#include <linux/version.h>
32#include <media/v4l2-ioctl.h> 31#include <media/v4l2-ioctl.h>
33#include <media/v4l2-common.h> 32#include <media/v4l2-common.h>
34#include <media/v4l2-ctrls.h> 33#include <media/v4l2-ctrls.h>
35 34
36#define FM_DRV_VERSION "0.10" 35#define FM_DRV_VERSION "0.1.1"
37/* Should match with FM_DRV_VERSION */
38#define FM_DRV_RADIO_VERSION KERNEL_VERSION(0, 0, 1)
39#define FM_DRV_NAME "ti_fmdrv" 36#define FM_DRV_NAME "ti_fmdrv"
40#define FM_DRV_CARD_SHORT_NAME "TI FM Radio" 37#define FM_DRV_CARD_SHORT_NAME "TI FM Radio"
41#define FM_DRV_CARD_LONG_NAME "Texas Instruments FM Radio" 38#define FM_DRV_CARD_LONG_NAME "Texas Instruments FM Radio"
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index 87010724f914..a4f05e018ca6 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -175,7 +175,6 @@ static int fm_v4l2_vidioc_querycap(struct file *file, void *priv,
175 strlcpy(capability->card, FM_DRV_CARD_SHORT_NAME, 175 strlcpy(capability->card, FM_DRV_CARD_SHORT_NAME,
176 sizeof(capability->card)); 176 sizeof(capability->card));
177 sprintf(capability->bus_info, "UART"); 177 sprintf(capability->bus_info, "UART");
178 capability->version = FM_DRV_RADIO_VERSION;
179 capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER | 178 capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER |
180 V4L2_CAP_RADIO | V4L2_CAP_MODULATOR | 179 V4L2_CAP_RADIO | V4L2_CAP_MODULATOR |
181 V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | 180 V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |