aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/compat_ioctl32.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-01-09 15:24:59 -0200
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 15:24:59 -0200
commite8efb71d02d008a665ba88e6f75af691d9425e49 (patch)
treecbfc9e13c45aa9c606ac03dfd10aa0cc7a80c567 /drivers/media/video/compat_ioctl32.c
parent97e2a01b6bd995bc3438b361e58b126a2c3cc0ca (diff)
V4L (0978): 64-bit fixes for removing warnings on compat_ioctl32
- 64-bit fixes for removing warnings on compat_ioctl32. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/compat_ioctl32.c')
-rw-r--r--drivers/media/video/compat_ioctl32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index 99774c42068..5472d36d73f 100644
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -2,6 +2,7 @@
#include <linux/compat.h>
#include <linux/videodev.h>
#include <linux/module.h>
+#include <linux/smp_lock.h>
#ifdef CONFIG_COMPAT
struct video_tuner32 {
@@ -307,9 +308,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
case _IOR('v' , BASE_VIDIOCPRIVATE+7, int):
ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
break;
-
- return ret;
}
+ return ret;
}
#else
long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)