diff options
Diffstat (limited to 'drivers/media/radio/radio-rtrack2.c')
-rw-r--r-- | drivers/media/radio/radio-rtrack2.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c index 070802103dc3..e2dde0807268 100644 --- a/drivers/media/radio/radio-rtrack2.c +++ b/drivers/media/radio/radio-rtrack2.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <asm/uaccess.h> /* copy to/from user */ | 17 | #include <asm/uaccess.h> /* copy to/from user */ |
18 | #include <linux/videodev2.h> /* kernel radio structs */ | 18 | #include <linux/videodev2.h> /* kernel radio structs */ |
19 | #include <media/v4l2-common.h> | 19 | #include <media/v4l2-common.h> |
20 | #include <media/v4l2-ioctl.h> | ||
20 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
21 | 22 | ||
22 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 23 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
@@ -294,12 +295,7 @@ static const struct file_operations rtrack2_fops = { | |||
294 | .llseek = no_llseek, | 295 | .llseek = no_llseek, |
295 | }; | 296 | }; |
296 | 297 | ||
297 | static struct video_device rtrack2_radio= | 298 | static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = { |
298 | { | ||
299 | .owner = THIS_MODULE, | ||
300 | .name = "RadioTrack II radio", | ||
301 | .type = VID_TYPE_TUNER, | ||
302 | .fops = &rtrack2_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 rtrack2_radio= | |||
314 | .vidioc_s_input = vidioc_s_input, | 310 | .vidioc_s_input = vidioc_s_input, |
315 | }; | 311 | }; |
316 | 312 | ||
313 | static struct video_device rtrack2_radio = { | ||
314 | .name = "RadioTrack II radio", | ||
315 | .fops = &rtrack2_fops, | ||
316 | .ioctl_ops = &rtrack2_ioctl_ops, | ||
317 | }; | ||
318 | |||
317 | static int __init rtrack2_init(void) | 319 | static int __init rtrack2_init(void) |
318 | { | 320 | { |
319 | if(io==-1) | 321 | if(io==-1) |