diff options
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 0f09784631ad..2a416cf205aa 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -1651,12 +1651,7 @@ static struct file_operations dev_fops = { | |||
1651 | .poll = dev_poll, | 1651 | .poll = dev_poll, |
1652 | }; | 1652 | }; |
1653 | 1653 | ||
1654 | static struct video_device gspca_template = { | 1654 | static const struct v4l2_ioctl_ops dev_ioctl_ops = { |
1655 | .name = "gspca main driver", | ||
1656 | .type = VID_TYPE_CAPTURE, | ||
1657 | .fops = &dev_fops, | ||
1658 | .release = dev_release, /* mandatory */ | ||
1659 | .minor = -1, | ||
1660 | .vidioc_querycap = vidioc_querycap, | 1655 | .vidioc_querycap = vidioc_querycap, |
1661 | .vidioc_dqbuf = vidioc_dqbuf, | 1656 | .vidioc_dqbuf = vidioc_dqbuf, |
1662 | .vidioc_qbuf = vidioc_qbuf, | 1657 | .vidioc_qbuf = vidioc_qbuf, |
@@ -1685,6 +1680,15 @@ static struct video_device gspca_template = { | |||
1685 | #endif | 1680 | #endif |
1686 | }; | 1681 | }; |
1687 | 1682 | ||
1683 | static struct video_device gspca_template = { | ||
1684 | .name = "gspca main driver", | ||
1685 | .type = VID_TYPE_CAPTURE, | ||
1686 | .fops = &dev_fops, | ||
1687 | .ioctl_ops = &dev_ioctl_ops, | ||
1688 | .release = dev_release, /* mandatory */ | ||
1689 | .minor = -1, | ||
1690 | }; | ||
1691 | |||
1688 | /* | 1692 | /* |
1689 | * probe and create a new gspca device | 1693 | * probe and create a new gspca device |
1690 | * | 1694 | * |