diff options
Diffstat (limited to 'drivers/media/radio/radio-maestro.c')
-rw-r--r-- | drivers/media/radio/radio-maestro.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index bddd3c409aa9..0ada1c697e8a 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
28 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
29 | #include <media/v4l2-common.h> | 29 | #include <media/v4l2-common.h> |
30 | #include <media/v4l2-ioctl.h> | ||
30 | 31 | ||
31 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 32 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
32 | #define RADIO_VERSION KERNEL_VERSION(0,0,6) | 33 | #define RADIO_VERSION KERNEL_VERSION(0,0,6) |
@@ -354,10 +355,7 @@ static u16 __devinit radio_power_on(struct radio_device *dev) | |||
354 | return (ofreq == radio_bits_get(dev)); | 355 | return (ofreq == radio_bits_get(dev)); |
355 | } | 356 | } |
356 | 357 | ||
357 | static struct video_device maestro_radio = { | 358 | static const struct v4l2_ioctl_ops maestro_ioctl_ops = { |
358 | .name = "Maestro radio", | ||
359 | .type = VID_TYPE_TUNER, | ||
360 | .fops = &maestro_fops, | ||
361 | .vidioc_querycap = vidioc_querycap, | 359 | .vidioc_querycap = vidioc_querycap, |
362 | .vidioc_g_tuner = vidioc_g_tuner, | 360 | .vidioc_g_tuner = vidioc_g_tuner, |
363 | .vidioc_s_tuner = vidioc_s_tuner, | 361 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -372,6 +370,12 @@ static struct video_device maestro_radio = { | |||
372 | .vidioc_s_ctrl = vidioc_s_ctrl, | 370 | .vidioc_s_ctrl = vidioc_s_ctrl, |
373 | }; | 371 | }; |
374 | 372 | ||
373 | static struct video_device maestro_radio = { | ||
374 | .name = "Maestro radio", | ||
375 | .fops = &maestro_fops, | ||
376 | .ioctl_ops = &maestro_ioctl_ops, | ||
377 | }; | ||
378 | |||
375 | static int __devinit maestro_probe(struct pci_dev *pdev, | 379 | static int __devinit maestro_probe(struct pci_dev *pdev, |
376 | const struct pci_device_id *ent) | 380 | const struct pci_device_id *ent) |
377 | { | 381 | { |