diff options
Diffstat (limited to 'drivers/media/radio/radio-maxiradio.c')
-rw-r--r-- | drivers/media/radio/radio-maxiradio.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 0133ecf3e04..43c75497dc4 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/pci.h> | 44 | #include <linux/pci.h> |
45 | #include <linux/videodev2.h> | 45 | #include <linux/videodev2.h> |
46 | #include <media/v4l2-common.h> | 46 | #include <media/v4l2-common.h> |
47 | #include <media/v4l2-ioctl.h> | ||
47 | 48 | ||
48 | #define DRIVER_VERSION "0.77" | 49 | #define DRIVER_VERSION "0.77" |
49 | 50 | ||
@@ -373,13 +374,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv, | |||
373 | return -EINVAL; | 374 | return -EINVAL; |
374 | } | 375 | } |
375 | 376 | ||
376 | static struct video_device maxiradio_radio = | 377 | static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = { |
377 | { | ||
378 | .owner = THIS_MODULE, | ||
379 | .name = "Maxi Radio FM2000 radio", | ||
380 | .type = VID_TYPE_TUNER, | ||
381 | .fops = &maxiradio_fops, | ||
382 | |||
383 | .vidioc_querycap = vidioc_querycap, | 378 | .vidioc_querycap = vidioc_querycap, |
384 | .vidioc_g_tuner = vidioc_g_tuner, | 379 | .vidioc_g_tuner = vidioc_g_tuner, |
385 | .vidioc_s_tuner = vidioc_s_tuner, | 380 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -394,6 +389,12 @@ static struct video_device maxiradio_radio = | |||
394 | .vidioc_s_ctrl = vidioc_s_ctrl, | 389 | .vidioc_s_ctrl = vidioc_s_ctrl, |
395 | }; | 390 | }; |
396 | 391 | ||
392 | static struct video_device maxiradio_radio = { | ||
393 | .name = "Maxi Radio FM2000 radio", | ||
394 | .fops = &maxiradio_fops, | ||
395 | .ioctl_ops = &maxiradio_ioctl_ops, | ||
396 | }; | ||
397 | |||
397 | static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | 398 | static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
398 | { | 399 | { |
399 | if(!request_region(pci_resource_start(pdev, 0), | 400 | if(!request_region(pci_resource_start(pdev, 0), |