diff options
Diffstat (limited to 'drivers/media/radio/dsbr100.c')
-rw-r--r-- | drivers/media/radio/dsbr100.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 4e3f83e4e48f..1ed88f3abe61 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c | |||
@@ -85,6 +85,7 @@ | |||
85 | #include <linux/input.h> | 85 | #include <linux/input.h> |
86 | #include <linux/videodev2.h> | 86 | #include <linux/videodev2.h> |
87 | #include <media/v4l2-common.h> | 87 | #include <media/v4l2-common.h> |
88 | #include <media/v4l2-ioctl.h> | ||
88 | #include <linux/usb.h> | 89 | #include <linux/usb.h> |
89 | 90 | ||
90 | /* | 91 | /* |
@@ -444,14 +445,7 @@ static const struct file_operations usb_dsbr100_fops = { | |||
444 | .llseek = no_llseek, | 445 | .llseek = no_llseek, |
445 | }; | 446 | }; |
446 | 447 | ||
447 | /* V4L2 interface */ | 448 | static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = { |
448 | static struct video_device dsbr100_videodev_template = | ||
449 | { | ||
450 | .owner = THIS_MODULE, | ||
451 | .name = "D-Link DSB-R 100", | ||
452 | .type = VID_TYPE_TUNER, | ||
453 | .fops = &usb_dsbr100_fops, | ||
454 | .release = video_device_release, | ||
455 | .vidioc_querycap = vidioc_querycap, | 449 | .vidioc_querycap = vidioc_querycap, |
456 | .vidioc_g_tuner = vidioc_g_tuner, | 450 | .vidioc_g_tuner = vidioc_g_tuner, |
457 | .vidioc_s_tuner = vidioc_s_tuner, | 451 | .vidioc_s_tuner = vidioc_s_tuner, |
@@ -466,6 +460,14 @@ static struct video_device dsbr100_videodev_template = | |||
466 | .vidioc_s_input = vidioc_s_input, | 460 | .vidioc_s_input = vidioc_s_input, |
467 | }; | 461 | }; |
468 | 462 | ||
463 | /* V4L2 interface */ | ||
464 | static struct video_device dsbr100_videodev_template = { | ||
465 | .name = "D-Link DSB-R 100", | ||
466 | .fops = &usb_dsbr100_fops, | ||
467 | .ioctl_ops = &usb_dsbr100_ioctl_ops, | ||
468 | .release = video_device_release, | ||
469 | }; | ||
470 | |||
469 | /* check if the device is present and register with v4l and | 471 | /* check if the device is present and register with v4l and |
470 | usb if it is */ | 472 | usb if it is */ |
471 | static int usb_dsbr100_probe(struct usb_interface *intf, | 473 | static int usb_dsbr100_probe(struct usb_interface *intf, |