diff options
Diffstat (limited to 'drivers/media/radio/radio-zoltrix.c')
-rw-r--r-- | drivers/media/radio/radio-zoltrix.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c index 43773c56c62f..9f17a332fa11 100644 --- a/drivers/media/radio/radio-zoltrix.c +++ b/drivers/media/radio/radio-zoltrix.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <asm/uaccess.h> /* copy to/from user */ | 37 | #include <asm/uaccess.h> /* copy to/from user */ |
38 | #include <linux/videodev2.h> /* kernel radio structs */ | 38 | #include <linux/videodev2.h> /* kernel radio structs */ |
39 | #include <media/v4l2-common.h> | 39 | #include <media/v4l2-common.h> |
40 | #include <media/v4l2-ioctl.h> | ||
40 | 41 | ||
41 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 42 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
42 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) | 43 | #define RADIO_VERSION KERNEL_VERSION(0,0,2) |
@@ -407,12 +408,7 @@ static const struct file_operations zoltrix_fops = | |||
407 | .llseek = no_llseek, | 408 | .llseek = no_llseek, |
408 | }; | 409 | }; |
409 | 410 | ||
410 | static struct video_device zoltrix_radio = | 411 | static const struct v4l2_ioctl_ops zoltrix_ioctl_ops = { |
411 | { | ||
412 | .owner = THIS_MODULE, | ||
413 | .name = "Zoltrix Radio Plus", | ||
414 | .type = VID_TYPE_TUNER, | ||
415 | .fops = &zoltrix_fops, | ||
416 | .vidioc_querycap = vidioc_querycap, | 412 | .vidioc_querycap = vidioc_querycap, |
417 | .vidioc_g_tuner = vidioc_g_tuner, | 413 | .vidioc_g_tuner = vidioc_g_tuner, |
418 | .vidioc_s_tuner = vidioc_s_tuner, | 414 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -427,6 +423,12 @@ static struct video_device zoltrix_radio = | |||
427 | .vidioc_s_ctrl = vidioc_s_ctrl, | 423 | .vidioc_s_ctrl = vidioc_s_ctrl, |
428 | }; | 424 | }; |
429 | 425 | ||
426 | static struct video_device zoltrix_radio = { | ||
427 | .name = "Zoltrix Radio Plus", | ||
428 | .fops = &zoltrix_fops, | ||
429 | .ioctl_ops = &zoltrix_ioctl_ops, | ||
430 | }; | ||
431 | |||
430 | static int __init zoltrix_init(void) | 432 | static int __init zoltrix_init(void) |
431 | { | 433 | { |
432 | if (io == -1) { | 434 | if (io == -1) { |