---

yaml --- r: 232218 b: refs/heads/master c: 34b8fc8 h: refs/heads/master v: v3
git-mirror · Jan 19, 2011 · e842871 · e842871
1 parent a36fb5f
commit e842871
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: a3bc5e3304c9ba8e7504597026d9ca93784d1239
+refs/heads/master: 34b8fc8e683cbcbbe47806260ef5dc505915b45f
diff --git 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,
 };