diff options
Diffstat (limited to 'drivers/media/radio/radio-sf16fmi.c')
-rw-r--r-- | drivers/media/radio/radio-sf16fmi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 66e052fd3909..bb5d92f104af 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/delay.h> /* udelay */ | 24 | #include <linux/delay.h> /* udelay */ |
25 | #include <linux/videodev2.h> /* kernel radio structs */ | 25 | #include <linux/videodev2.h> /* kernel radio structs */ |
26 | #include <media/v4l2-common.h> | 26 | #include <media/v4l2-common.h> |
27 | #include <media/v4l2-ioctl.h> | ||
27 | #include <linux/isapnp.h> | 28 | #include <linux/isapnp.h> |
28 | #include <asm/io.h> /* outb, outb_p */ | 29 | #include <asm/io.h> /* outb, outb_p */ |
29 | #include <asm/uaccess.h> /* copy to/from user */ | 30 | #include <asm/uaccess.h> /* copy to/from user */ |
@@ -294,12 +295,7 @@ static const struct file_operations fmi_fops = { | |||
294 | .llseek = no_llseek, | 295 | .llseek = no_llseek, |
295 | }; | 296 | }; |
296 | 297 | ||
297 | static struct video_device fmi_radio= | 298 | static const struct v4l2_ioctl_ops fmi_ioctl_ops = { |
298 | { | ||
299 | .owner = THIS_MODULE, | ||
300 | .name = "SF16FMx radio", | ||
301 | .type = VID_TYPE_TUNER, | ||
302 | .fops = &fmi_fops, | ||
303 | .vidioc_querycap = vidioc_querycap, | 299 | .vidioc_querycap = vidioc_querycap, |
304 | .vidioc_g_tuner = vidioc_g_tuner, | 300 | .vidioc_g_tuner = vidioc_g_tuner, |
305 | .vidioc_s_tuner = vidioc_s_tuner, | 301 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -314,6 +310,12 @@ static struct video_device fmi_radio= | |||
314 | .vidioc_s_ctrl = vidioc_s_ctrl, | 310 | .vidioc_s_ctrl = vidioc_s_ctrl, |
315 | }; | 311 | }; |
316 | 312 | ||
313 | static struct video_device fmi_radio = { | ||
314 | .name = "SF16FMx radio", | ||
315 | .fops = &fmi_fops, | ||
316 | .ioctl_ops = &fmi_ioctl_ops, | ||
317 | }; | ||
318 | |||
317 | /* ladis: this is my card. does any other types exist? */ | 319 | /* ladis: this is my card. does any other types exist? */ |
318 | static struct isapnp_device_id id_table[] __devinitdata = { | 320 | static struct isapnp_device_id id_table[] __devinitdata = { |
319 | { ISAPNP_ANY_ID, ISAPNP_ANY_ID, | 321 | { ISAPNP_ANY_ID, ISAPNP_ANY_ID, |