diff options
Diffstat (limited to 'drivers/media/radio/radio-gemtek.c')
-rw-r--r-- | drivers/media/radio/radio-gemtek.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c index 81f6aeb1cd11..2b1a6221de6d 100644 --- a/drivers/media/radio/radio-gemtek.c +++ b/drivers/media/radio/radio-gemtek.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <asm/io.h> /* outb, outb_p */ | 23 | #include <asm/io.h> /* outb, outb_p */ |
24 | #include <asm/uaccess.h> /* copy to/from user */ | 24 | #include <asm/uaccess.h> /* copy to/from user */ |
25 | #include <linux/videodev2.h> /* kernel radio structs */ | 25 | #include <linux/videodev2.h> /* kernel radio structs */ |
26 | #include <media/v4l2-ioctl.h> | ||
26 | #include <media/v4l2-common.h> | 27 | #include <media/v4l2-common.h> |
27 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
28 | 29 | ||
@@ -552,11 +553,7 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a) | |||
552 | return 0; | 553 | return 0; |
553 | } | 554 | } |
554 | 555 | ||
555 | static struct video_device gemtek_radio = { | 556 | static const struct v4l2_ioctl_ops gemtek_ioctl_ops = { |
556 | .owner = THIS_MODULE, | ||
557 | .name = "GemTek Radio card", | ||
558 | .type = VID_TYPE_TUNER, | ||
559 | .fops = &gemtek_fops, | ||
560 | .vidioc_querycap = vidioc_querycap, | 557 | .vidioc_querycap = vidioc_querycap, |
561 | .vidioc_g_tuner = vidioc_g_tuner, | 558 | .vidioc_g_tuner = vidioc_g_tuner, |
562 | .vidioc_s_tuner = vidioc_s_tuner, | 559 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -571,6 +568,12 @@ static struct video_device gemtek_radio = { | |||
571 | .vidioc_s_ctrl = vidioc_s_ctrl | 568 | .vidioc_s_ctrl = vidioc_s_ctrl |
572 | }; | 569 | }; |
573 | 570 | ||
571 | static struct video_device gemtek_radio = { | ||
572 | .name = "GemTek Radio card", | ||
573 | .fops = &gemtek_fops, | ||
574 | .ioctl_ops = &gemtek_ioctl_ops, | ||
575 | }; | ||
576 | |||
574 | /* | 577 | /* |
575 | * Initialization / cleanup related stuff. | 578 | * Initialization / cleanup related stuff. |
576 | */ | 579 | */ |