summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-11-14 11:17:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-01 20:10:12 -0200
commitca2621963de3934613f8aa63e19c03b1751707ae (patch)
treeb4893dc0860996fb458a3f65f82e06e045be7f19 /drivers/media
parentfeecf93d6b16887bf7e12fcc604bfba9048b2fa5 (diff)
[media] et61x251_core: trivial conversion to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/et61x251/et61x251_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index a5cfc76b40b..bb164099ea2 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -2530,7 +2530,7 @@ static const struct v4l2_file_operations et61x251_fops = {
.owner = THIS_MODULE,
.open = et61x251_open,
.release = et61x251_release,
- .ioctl = et61x251_ioctl,
+ .unlocked_ioctl = et61x251_ioctl,
.read = et61x251_read,
.poll = et61x251_poll,
.mmap = et61x251_mmap,