1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index b0ccf7cb5952..6290553d24be 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -22,6 +22,7 @@
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev2.h>    /* kernel radio structs         */
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>
 
 static struct mutex lock;
@@ -410,12 +411,7 @@ static const struct file_operations fmr2_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device fmr2_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "SF16FMR2 radio",
-        . type          = VID_TYPE_TUNER,
-        .fops           = &fmr2_fops,
+static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -430,6 +426,12 @@ static struct video_device fmr2_radio=
         .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
+static struct video_device fmr2_radio = {
+        .name           = "SF16FMR2 radio",
+        .fops           = &fmr2_fops,
+        .ioctl_ops      = &fmr2_ioctl_ops,
+};
+
 static int __init fmr2_init(void)
 {
         fmr2_unit.port = io;