From 446f539d8bed440da1b7e4dda9a97e12123de0cd Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 13 Feb 2011 21:52:02 -0300
Subject: [PATCH] --- yaml --- r: 241843 b: refs/heads/master c:
 b618726414f3eb7b0b122e459efe3c5edc36b2fc h: refs/heads/master i:   241841:
 909416c29e7527c7d4b6da7b6f6a97bd88d7c01c   241839:
 bb405e67fb21e8fcb183d942f7978fabd5d4a8cf v: v3

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

diff --git a/[refs] b/[refs]
index 5de1696e222c..788a9848179d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e105039da20f57958a2f538048a0f1bfb576b8b
+refs/heads/master: b618726414f3eb7b0b122e459efe3c5edc36b2fc
diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c
index 508dabbed986..e2fc45509b03 100644
--- a/trunk/drivers/media/video/cx88/cx88-video.c
+++ b/trunk/drivers/media/video/cx88/cx88-video.c
@@ -1672,7 +1672,7 @@ static const struct v4l2_file_operations video_fops =
 	.read	       = video_read,
 	.poll          = video_poll,
 	.mmap	       = video_mmap,
-	.ioctl	       = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops video_ioctl_ops = {
@@ -1722,7 +1722,7 @@ static const struct v4l2_file_operations radio_fops =
 	.owner         = THIS_MODULE,
 	.open          = video_open,
 	.release       = video_release,
-	.ioctl         = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops radio_ioctl_ops = {