From 39f749b5ab9460edcfa9299df784ba4d2bf26877 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 29 Dec 2008 19:15:43 -0300
Subject: [PATCH] --- yaml --- r: 124575 b: refs/heads/master c:
 92ab7886119da6375a983713eedab444e32094f6 h: refs/heads/master i:   124573:
 aa7194d1a8b3340c1a78d8eb0b20af9ddd253269   124571:
 7ca1a31c27f8b1609ab25e0f46f9ee9687a43664   124567:
 d5602cfc1ded7830509114ce309d459183c419c3   124559:
 8dd1fbace5b0789882e790ab807614569ce6bb9e   124543:
 8c744bca15f747fb6bea2962e123aabe847c780a v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/v4l2-ioctl.c | 2 +-
 trunk/include/media/v4l2-ioctl.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 718c77accfb3..ba87c66edce4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 902571aaa91263bc27e923e94ddf161c106befee
+refs/heads/master: 92ab7886119da6375a983713eedab444e32094f6
diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c
index bef4286933a1..b063381f4b3b 100644
--- a/trunk/drivers/media/video/v4l2-ioctl.c
+++ b/trunk/drivers/media/video/v4l2-ioctl.c
@@ -1852,7 +1852,7 @@ static int __video_do_ioctl(struct file *file,
 	return ret;
 }
 
-int __video_ioctl2(struct file *file,
+long __video_ioctl2(struct file *file,
 	       unsigned int cmd, unsigned long arg)
 {
 	char	sbuf[128];
diff --git a/trunk/include/media/v4l2-ioctl.h b/trunk/include/media/v4l2-ioctl.h
index c884432f9383..fcdb58c4ce07 100644
--- a/trunk/include/media/v4l2-ioctl.h
+++ b/trunk/include/media/v4l2-ioctl.h
@@ -297,7 +297,7 @@ extern int video_usercopy(struct file *file, unsigned int cmd,
 /* Standard handlers for V4L ioctl's */
 
 /* This prototype is used on fops.unlocked_ioctl */
-extern int __video_ioctl2(struct file *file,
+extern long __video_ioctl2(struct file *file,
 			unsigned int cmd, unsigned long arg);
 
 /* This prototype is used on fops.ioctl