summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-10-18 13:39:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 14:31:25 -0200
commitd5fbf32f381ad841d9d9537aa1b6f74796703361 (patch)
tree48149c1f8ace4aae98fb6a8473309cad39da44c9 /include/media
parentf496bc716613378f2a3f9097a8e3ea4e4e30e79d (diff)
downloadlinux-d5fbf32f381ad841d9d9537aa1b6f74796703361.tar.gz
linux-d5fbf32f381ad841d9d9537aa1b6f74796703361.tar.bz2
linux-d5fbf32f381ad841d9d9537aa1b6f74796703361.zip
V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support.
Based on an older patch from Sakari Ailus. Cc: Sakari Ailus <sakari.ailus@nokia.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-ioctl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 0bef03add796..3e11dfe38dc3 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -285,7 +285,9 @@ extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
unsigned long arg);
extern int video_ioctl2(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg);
+ unsigned int cmd, unsigned long arg);
+extern long video_ioctl2_unlocked(struct file *file,
+ unsigned int cmd, unsigned long arg);
/* Include support for obsoleted stuff */
extern int video_usercopy(struct inode *inode, struct file *file,