---

yaml --- r: 250339 b: refs/heads/master c: 1f38571 h: refs/heads/master i: 250337: 7a5674a 250335: 3ba2a2f v: v3
git-mirror · May 20, 2011 · d14c797 · d14c797
1 parent 75bff3e
commit d14c797
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ecff8c93e14226e0c39d930b633d5ade78526cc
+refs/heads/master: 1f385717c923bf5ca0a60de22c892e466d4edf0f
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -1666,10 +1666,10 @@ static struct video_device tm6000_template = {
 };
 
 static const struct v4l2_file_operations radio_fops = {
-	.owner	  = THIS_MODULE,
-	.open	  = tm6000_open,
-	.release  = tm6000_release,
-	.ioctl	  = video_ioctl2,
+	.owner		= THIS_MODULE,
+	.open		= tm6000_open,
+	.release	= tm6000_release,
+	.unlocked_ioctl	= video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops radio_ioctl_ops = {