aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-compat-ioctl32.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-30 04:42:40 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-02 14:11:39 -0500
commit9bb7cde793f0637cfbdd21c04050ffcef33a5624 (patch)
tree47ea0a0eead095f87b68fd16c9c13ef938bc315f /drivers/media/video/v4l2-compat-ioctl32.c
parent069b747931f13eda289c1d59a09ecc8162281a76 (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-compat-ioctl32.c')
-rw-r--r--drivers/media/video/v4l2-compat-ioctl32.c4
1 files changed, 2 insertions, 2 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
940long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) 940long 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}
1075EXPORT_SYMBOL_GPL(v4l_compat_ioctl32); 1075EXPORT_SYMBOL_GPL(v4l2_compat_ioctl32);
1076#endif 1076#endif
1077 1077
1078MODULE_LICENSE("GPL"); 1078MODULE_LICENSE("GPL");