From: Stefan Ringel <stefan.ringel@arcor.de>
Date: Mon, 9 May 2011 19:54:01 +0000 (-0300)
Subject: [media] tm6000: change from ioctl to unlocked_ioctl
X-Git-Tag: v3.0-rc1~322^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1f385717c923bf5ca0a60de22c892e466d4edf0f;p=linux.git

[media] tm6000: change from ioctl to unlocked_ioctl

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index ea5ad6c77206..2d83204883ad 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/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 = {