From f5ec76e083a1f01fd249659e6d38724f1af2b5d4 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 15 Sep 2010 08:22:09 -0300
Subject: [PATCH] --- yaml --- r: 219188 b: refs/heads/master c:
 8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/video/bt8xx/bttv-driver.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3ff6243e12f5..13e9b1e5d545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c37db91fd0d42d27141b6c49b768070df29e1c5e
+refs/heads/master: 8979e9d42b87648fd89bcc5d8b3157a8f3f4dfdb
diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c
index 056888cbc8e7..69a8ad24c0b3 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-driver.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-driver.c
@@ -3417,13 +3417,13 @@ bttv_mmap(struct file *file, struct vm_area_struct *vma)
 
 static const struct v4l2_file_operations bttv_fops =
 {
-	.owner	  = THIS_MODULE,
-	.open	  = bttv_open,
-	.release  = bttv_release,
-	.ioctl	  = video_ioctl2,
-	.read	  = bttv_read,
-	.mmap	  = bttv_mmap,
-	.poll     = bttv_poll,
+	.owner		  = THIS_MODULE,
+	.open		  = bttv_open,
+	.release	  = bttv_release,
+	.unlocked_ioctl	  = video_ioctl2,
+	.read		  = bttv_read,
+	.mmap		  = bttv_mmap,
+	.poll		  = bttv_poll,
 };
 
 static const struct v4l2_ioctl_ops bttv_ioctl_ops = {