From 90c5293601a9142faaf6205b9d6ffd1e7519ee5a Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 14 Nov 2010 13:09:21 -0300
Subject: [PATCH] --- yaml --- r: 223384 b: refs/heads/master c:
 20aa5bb9dc4b5aba1b4d0f15aa92c4e83721a343 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/media/video/cafe_ccic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d2d25dd0f85f..c9ee0b140527 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca2621963de3934613f8aa63e19c03b1751707ae
+refs/heads/master: 20aa5bb9dc4b5aba1b4d0f15aa92c4e83721a343
diff --git a/trunk/drivers/media/video/cafe_ccic.c b/trunk/drivers/media/video/cafe_ccic.c
index 7bc36670071a..8e6634ce92e7 100644
--- a/trunk/drivers/media/video/cafe_ccic.c
+++ b/trunk/drivers/media/video/cafe_ccic.c
@@ -1775,7 +1775,7 @@ static const struct v4l2_file_operations cafe_v4l_fops = {
 	.read = cafe_v4l_read,
 	.poll = cafe_v4l_poll,
 	.mmap = cafe_v4l_mmap,
-	.ioctl = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {