diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 10:42:40 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 10:42:40 +0100 |
| commit | 11aa6827bc8e1035b00c3e957e46b1fd9de17a85 (patch) | |
| tree | cb78ab4260cb80b95f617454f96349a15fed8512 /linux | |
| parent | 3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a (diff) | |
| download | mediapointer-dvb-s2-11aa6827bc8e1035b00c3e957e46b1fd9de17a85.tar.gz mediapointer-dvb-s2-11aa6827bc8e1035b00c3e957e46b1fd9de17a85.tar.bz2 | |
v4l: rename v4l_compat_ioctl32 to v4l2_compat_ioctl32
From: Hans Verkuil <hverkuil@xs4all.nl>
This rename prevents conflicts with the older compat_ioctl32 module.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/v4l2-compat-ioctl32.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 4 | ||||
| -rw-r--r-- | linux/include/media/v4l2-ioctl.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/video/v4l2-compat-ioctl32.c b/linux/drivers/media/video/v4l2-compat-ioctl32.c index a20417fb1..dedd0dea3 100644 --- a/linux/drivers/media/video/v4l2-compat-ioctl32.c +++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c @@ -942,7 +942,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar 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 *file, unsigned int cmd, unsigned long arg) } return ret; } -EXPORT_SYMBOL_GPL(v4l_compat_ioctl32); +EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32); #endif MODULE_LICENSE("GPL"); diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index 8a56e9760..9e34e9ec2 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -291,7 +291,7 @@ static const struct file_operations v4l2_unlocked_fops = { .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_fops = { .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 --git a/linux/include/media/v4l2-ioctl.h b/linux/include/media/v4l2-ioctl.h index 172c39678..bf0e723a9 100644 --- a/linux/include/media/v4l2-ioctl.h +++ b/linux/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 |