diff options
-rw-r--r-- | drivers/media/video/v4l2-compat-ioctl32.c | 4 | ||||
-rw-r--r-- | drivers/media/video/v4l2-dev.c | 4 | ||||
-rw-r--r-- | include/media/v4l2-ioctl.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c index 28861e4910f3..ec81b9737bd7 100644 --- a/drivers/media/video/v4l2-compat-ioctl32.c +++ b/drivers/media/video/v4l2-compat-ioctl32.c | |||
@@ -937,7 +937,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar | |||
937 | return err; | 937 | return err; |
938 | } | 938 | } |
939 | 939 | ||
940 | long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) | 940 | long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) |
941 | { | 941 | { |
942 | long ret = -ENOIOCTLCMD; | 942 | long ret = -ENOIOCTLCMD; |
943 | 943 | ||
@@ -1072,7 +1072,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) | |||
1072 | } | 1072 | } |
1073 | return ret; | 1073 | return ret; |
1074 | } | 1074 | } |
1075 | EXPORT_SYMBOL_GPL(v4l_compat_ioctl32); | 1075 | EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32); |
1076 | #endif | 1076 | #endif |
1077 | 1077 | ||
1078 | MODULE_LICENSE("GPL"); | 1078 | MODULE_LICENSE("GPL"); |
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, |
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, | |||
288 | 288 | ||
289 | #ifdef CONFIG_COMPAT | 289 | #ifdef CONFIG_COMPAT |
290 | /* 32 Bits compatibility layer for 64 bits processors */ | 290 | /* 32 Bits compatibility layer for 64 bits processors */ |
291 | extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, | 291 | extern long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, |
292 | unsigned long arg); | 292 | unsigned long arg); |
293 | #endif | 293 | #endif |
294 | 294 | ||