From d14c797c0e6a78023a5f470f7c88680fc44fb7ce Mon Sep 17 00:00:00 2001
From: Stefan Ringel <stefan.ringel@arcor.de>
Date: Mon, 9 May 2011 16:54:01 -0300
Subject: [PATCH] --- yaml --- r: 250339 b: refs/heads/master c:
 1f385717c923bf5ca0a60de22c892e466d4edf0f h: refs/heads/master i:   250337:
 7a5674a8378ba0d3a05c2a9ddfb30b70000dde8d   250335:
 3ba2a2f32e35a977983fc522743cc36439ae97b1 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-video.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 490254507bcc..88a7b5f0f469 100644
--- 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
index ea5ad6c77206..2d83204883ad 100644
--- 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 = {