summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-ioctl.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-30 10:42:40 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-02 20:11:39 +0100
commit9bb7cde793f0637cfbdd21c04050ffcef33a5624 (patch)
tree47ea0a0eead095f87b68fd16c9c13ef938bc315f /include/media/v4l2-ioctl.h
parentV4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl. (diff)
downloadlinux-9bb7cde793f0637cfbdd21c04050ffcef33a5624.tar.xz
linux-9bb7cde793f0637cfbdd21c04050ffcef33a5624.zip
V4L/DVB (10139): v4l: rename v4l_compat_ioctl32 to v4l2_compat_ioctl32
This rename prevents conflicts with the older compat_ioctl32 module. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/v4l2-ioctl.h')
-rw-r--r--include/media/v4l2-ioctl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 172c39678c5a..bf0e723a99c1 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -288,7 +288,7 @@ long v4l_compat_translate_ioctl(struct file *file,
#ifdef CONFIG_COMPAT
/* 32 Bits compatibility layer for 64 bits processors */
-extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
+extern long v4l2_compat_ioctl32(struct file *file, unsigned int cmd,
unsigned long arg);
#endif