summaryrefslogtreecommitdiff
path: root/linux/drivers/media/radio/radio-sf16fmr2.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-07-26 12:39:02 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-07-26 12:39:02 +0200
commit72f5824b3f52fedf99d70a834d9be2a10ee318c6 (patch)
tree6ff5926046a63813899eea2ae7fc20565d92b051 /linux/drivers/media/radio/radio-sf16fmr2.c
parent350bbc5926746c35a38095da02fa7e82d67cca22 (diff)
parentddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (diff)
downloadmediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.gz
mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/radio/radio-sf16fmr2.c')
-rw-r--r--linux/drivers/media/radio/radio-sf16fmr2.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/radio/radio-sf16fmr2.c b/linux/drivers/media/radio/radio-sf16fmr2.c
index 555b97a6c..7e8516a2b 100644
--- a/linux/drivers/media/radio/radio-sf16fmr2.c
+++ b/linux/drivers/media/radio/radio-sf16fmr2.c
@@ -412,12 +412,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,
@@ -432,6 +427,13 @@ static struct video_device fmr2_radio=
.vidioc_s_ctrl = vidioc_s_ctrl,
};
+static struct video_device fmr2_radio = {
+ .name = "SF16FMR2 radio",
+ .type = VID_TYPE_TUNER,
+ .fops = &fmr2_fops,
+ .ioctl_ops = &fmr2_ioctl_ops,
+};
+
static int __init fmr2_init(void)
{
fmr2_unit.port = io;