---

yaml --- r: 223383 b: refs/heads/master c: ca26219 h: refs/heads/master i: 223381: 3e2b2a7 223379: 096f0e5 223375: beefce2 v: v3
git-mirror · Dec 1, 2010 · 2144455 · 2144455
1 parent 4bfad12
commit 2144455
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: feecf93d6b16887bf7e12fcc604bfba9048b2fa5
+refs/heads/master: ca2621963de3934613f8aa63e19c03b1751707ae
diff --git a/trunk/drivers/media/video/et61x251/et61x251_core.c b/trunk/drivers/media/video/et61x251/et61x251_core.c
@@ -2530,7 +2530,7 @@ static const struct v4l2_file_operations et61x251_fops = {
 	.owner = THIS_MODULE,
 	.open =    et61x251_open,
 	.release = et61x251_release,
-	.ioctl =   et61x251_ioctl,
+	.unlocked_ioctl =   et61x251_ioctl,
 	.read =    et61x251_read,
 	.poll =    et61x251_poll,
 	.mmap =    et61x251_mmap,