summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-03-09 17:08:48 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-09 17:08:48 -0800
commit922b072ee97aa79285920ab2eb412a039dbd1206 (patch)
treed95b28106eb24c98a8e9cb4b4b6cadc71c1977db /include/linux
parent089d5f720f0645d44762134e985e9e9b505ca410 (diff)
[PATCH] fbdev compat_ioctl warning fix
Fix some confusion over fbdev compat_ioctl return types - compat_ioctls return `long'. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 974894b623cd..0e9789ed0003 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -585,7 +585,7 @@ struct fb_ops {
unsigned long arg, struct fb_info *info);
/* Handle 32bit compat ioctl (optional) */
- int (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg,
+ long (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg,
struct fb_info *info);
/* perform fb specific mmap */