From 011380c2c726150edd6b649433c514c808c16449 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 25 May 2012 12:30:18 -0300
Subject: [PATCH] --- yaml --- r: 320156 b: refs/heads/master c:
 fcbd504989739897db0c7bd1c3e55e42c1682e21 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7316a63d428a..007a512aaa24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48d68801d7fe2cefd3963428917b74c93a69ff99
+refs/heads/master: fcbd504989739897db0c7bd1c3e55e42c1682e21
diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c
index e3bc8f7fcff4..843ffd9e533b 100644
--- a/trunk/drivers/media/video/cx88/cx88-blackbird.c
+++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c
@@ -1089,7 +1089,7 @@ static const struct v4l2_file_operations mpeg_fops =
 	.read	       = mpeg_read,
 	.poll          = mpeg_poll,
 	.mmap	       = mpeg_mmap,
-	.ioctl	       = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {