The patch number 10139 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Hans Verkuil <[email protected]>
v4l: rename v4l_compat_ioctl32 to v4l2_compat_ioctl32
This rename prevents conflicts with the older compat_ioctl32 module.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/video/v4l2-compat-ioctl32.c | 4 ++--
linux/drivers/media/video/v4l2-dev.c | 4 ++--
linux/include/media/v4l2-ioctl.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff -r 6ac0b8ceed2f -r 0a32c8803a30
linux/drivers/media/video/v4l2-compat-ioctl32.c
--- a/linux/drivers/media/video/v4l2-compat-ioctl32.c Tue Dec 30 11:04:34
2008 +0100
+++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c Tue Dec 30 10:42:40
2008 +0100
@@ -942,7 +942,7 @@ static long do_video_ioctl(struct file *
return err;
}
-long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
+long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long
arg)
{
long ret = -ENOIOCTLCMD;
@@ -1077,7 +1077,7 @@ long v4l_compat_ioctl32(struct file *fil
}
return ret;
}
-EXPORT_SYMBOL_GPL(v4l_compat_ioctl32);
+EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32);
#endif
MODULE_LICENSE("GPL");
diff -r 6ac0b8ceed2f -r 0a32c8803a30 linux/drivers/media/video/v4l2-dev.c
--- a/linux/drivers/media/video/v4l2-dev.c Tue Dec 30 11:04:34 2008 +0100
+++ b/linux/drivers/media/video/v4l2-dev.c Tue Dec 30 10:42:40 2008 +0100
@@ -291,7 +291,7 @@ static const struct file_operations v4l2
.mmap = v4l2_mmap,
.unlocked_ioctl = v4l2_unlocked_ioctl,
#ifdef CONFIG_COMPAT
- .compat_ioctl = v4l_compat_ioctl32,
+ .compat_ioctl = v4l2_compat_ioctl32,
#endif
.release = v4l2_release,
.poll = v4l2_poll,
@@ -306,7 +306,7 @@ static const struct file_operations v4l2
.mmap = v4l2_mmap,
.ioctl = v4l2_ioctl,
#ifdef CONFIG_COMPAT
- .compat_ioctl = v4l_compat_ioctl32,
+ .compat_ioctl = v4l2_compat_ioctl32,
#endif
.release = v4l2_release,
.poll = v4l2_poll,
diff -r 6ac0b8ceed2f -r 0a32c8803a30 linux/include/media/v4l2-ioctl.h
--- a/linux/include/media/v4l2-ioctl.h Tue Dec 30 11:04:34 2008 +0100
+++ b/linux/include/media/v4l2-ioctl.h Tue Dec 30 10:42:40 2008 +0100
@@ -288,7 +288,7 @@ long v4l_compat_translate_ioctl(struct f
#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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/0a32c8803a30af34b77ff34f03f4b8eac58a321d
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
