From e842871160747628f8a8b631e57ccc9e56468d91 Mon Sep 17 00:00:00 2001
From: Matti Aaltonen <matti.j.aaltonen@nokia.com>
Date: Tue, 4 Jan 2011 08:29:37 -0300
Subject: [PATCH] --- yaml --- r: 232218 b: refs/heads/master c:
 34b8fc8e683cbcbbe47806260ef5dc505915b45f h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/radio/radio-wl1273.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 008d250bfb4b..e5596cc658fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3bc5e3304c9ba8e7504597026d9ca93784d1239
+refs/heads/master: 34b8fc8e683cbcbbe47806260ef5dc505915b45f
diff --git a/trunk/drivers/media/radio/radio-wl1273.c b/trunk/drivers/media/radio/radio-wl1273.c
index dd6bd364efa0..7ecc8e657663 100644
--- a/trunk/drivers/media/radio/radio-wl1273.c
+++ b/trunk/drivers/media/radio/radio-wl1273.c
@@ -1407,7 +1407,7 @@ static const struct v4l2_file_operations wl1273_fops = {
 	.read		= wl1273_fm_fops_read,
 	.write		= wl1273_fm_fops_write,
 	.poll		= wl1273_fm_fops_poll,
-	.ioctl		= video_ioctl2,
+	.unlocked_ioctl	= video_ioctl2,
 	.open		= wl1273_fm_fops_open,
 	.release	= wl1273_fm_fops_release,
 };