diff options
Diffstat (limited to 'drivers/media/radio/radio-aimslab.c')
-rw-r--r-- | drivers/media/radio/radio-aimslab.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index 1ec18ed1a73..eba9209b302 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <asm/uaccess.h> /* copy to/from user */ | 36 | #include <asm/uaccess.h> /* copy to/from user */ |
37 | #include <linux/videodev2.h> /* kernel radio structs */ | 37 | #include <linux/videodev2.h> /* kernel radio structs */ |
38 | #include <media/v4l2-common.h> | 38 | #include <media/v4l2-common.h> |
39 | #include <media/v4l2-ioctl.h> | ||
39 | 40 | ||
40 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 41 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
41 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) | 42 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) |
@@ -388,12 +389,7 @@ static const struct file_operations rtrack_fops = { | |||
388 | .llseek = no_llseek, | 389 | .llseek = no_llseek, |
389 | }; | 390 | }; |
390 | 391 | ||
391 | static struct video_device rtrack_radio= | 392 | static const struct v4l2_ioctl_ops rtrack_ioctl_ops = { |
392 | { | ||
393 | .owner = THIS_MODULE, | ||
394 | .name = "RadioTrack radio", | ||
395 | .type = VID_TYPE_TUNER, | ||
396 | .fops = &rtrack_fops, | ||
397 | .vidioc_querycap = vidioc_querycap, | 393 | .vidioc_querycap = vidioc_querycap, |
398 | .vidioc_g_tuner = vidioc_g_tuner, | 394 | .vidioc_g_tuner = vidioc_g_tuner, |
399 | .vidioc_s_tuner = vidioc_s_tuner, | 395 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -408,6 +404,12 @@ static struct video_device rtrack_radio= | |||
408 | .vidioc_s_ctrl = vidioc_s_ctrl, | 404 | .vidioc_s_ctrl = vidioc_s_ctrl, |
409 | }; | 405 | }; |
410 | 406 | ||
407 | static struct video_device rtrack_radio = { | ||
408 | .name = "RadioTrack radio", | ||
409 | .fops = &rtrack_fops, | ||
410 | .ioctl_ops = &rtrack_ioctl_ops, | ||
411 | }; | ||
412 | |||
411 | static int __init rtrack_init(void) | 413 | static int __init rtrack_init(void) |
412 | { | 414 | { |
413 | if(io==-1) | 415 | if(io==-1) |