---

yaml --- r: 223731 b: refs/heads/master c: 8fd0bda h: refs/heads/master i: 223729: 60b30db 223727: e718fd6 v: v3
git-mirror · Jan 3, 2011 · 3da0252 · 3da0252
1 parent f2cbe7d
commit 3da0252
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: 46e67acd5d4cacda758e871eebd15cef4e2c2665
+refs/heads/master: 8fd0bda511406ef0e9dcce9be055d7ab931e92ba
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -2377,7 +2377,7 @@ static const struct v4l2_file_operations radio_fops = {
 	.owner         = THIS_MODULE,
 	.open          = em28xx_v4l2_open,
 	.release       = em28xx_v4l2_close,
-	.ioctl	       = video_ioctl2,
+	.unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops radio_ioctl_ops = {