---

yaml --- r: 320156 b: refs/heads/master c: fcbd504 h: refs/heads/master v: v3
git-mirror · Jul 6, 2012 · 011380c · 011380c
1 parent dd2824e
commit 011380c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 = {