diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 04:42:40 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 14:11:39 -0500 |
commit | 9bb7cde793f0637cfbdd21c04050ffcef33a5624 (patch) | |
tree | 47ea0a0eead095f87b68fd16c9c13ef938bc315f /drivers/media/video/v4l2-dev.c | |
parent | 069b747931f13eda289c1d59a09ecc8162281a76 (diff) |
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 'drivers/media/video/v4l2-dev.c')
-rw-r--r-- | drivers/media/video/v4l2-dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 000013448b60..13f87c22e78d 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c | |||
@@ -253,7 +253,7 @@ static const struct file_operations v4l2_unlocked_fops = { | |||
253 | .mmap = v4l2_mmap, | 253 | .mmap = v4l2_mmap, |
254 | .unlocked_ioctl = v4l2_unlocked_ioctl, | 254 | .unlocked_ioctl = v4l2_unlocked_ioctl, |
255 | #ifdef CONFIG_COMPAT | 255 | #ifdef CONFIG_COMPAT |
256 | .compat_ioctl = v4l_compat_ioctl32, | 256 | .compat_ioctl = v4l2_compat_ioctl32, |
257 | #endif | 257 | #endif |
258 | .release = v4l2_release, | 258 | .release = v4l2_release, |
259 | .poll = v4l2_poll, | 259 | .poll = v4l2_poll, |
@@ -268,7 +268,7 @@ static const struct file_operations v4l2_fops = { | |||
268 | .mmap = v4l2_mmap, | 268 | .mmap = v4l2_mmap, |
269 | .ioctl = v4l2_ioctl, | 269 | .ioctl = v4l2_ioctl, |
270 | #ifdef CONFIG_COMPAT | 270 | #ifdef CONFIG_COMPAT |
271 | .compat_ioctl = v4l_compat_ioctl32, | 271 | .compat_ioctl = v4l2_compat_ioctl32, |
272 | #endif | 272 | #endif |
273 | .release = v4l2_release, | 273 | .release = v4l2_release, |
274 | .poll = v4l2_poll, | 274 | .poll = v4l2_poll, |