summaryrefslogtreecommitdiffstats
path: root/drivers/video/sbuslib.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-01-18 04:49:59 +0100
committerSteve French <sfrench@us.ibm.com>2006-01-18 04:49:59 +0100
commitd65177c1ae7f085723154105c5dc8d9e16ae8265 (patch)
tree14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/video/sbuslib.h
parent[CIFS] Remove compiler warning (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-d65177c1ae7f085723154105c5dc8d9e16ae8265.tar.xz
linux-d65177c1ae7f085723154105c5dc8d9e16ae8265.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/video/sbuslib.h')
-rw-r--r--drivers/video/sbuslib.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sbuslib.h b/drivers/video/sbuslib.h
index b470e52ce9e2..492828c3fe8f 100644
--- a/drivers/video/sbuslib.h
+++ b/drivers/video/sbuslib.h
@@ -20,7 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map,
int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
struct fb_info *info,
int type, int fb_depth, unsigned long fb_size);
-long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg, struct fb_info *info);
+int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
+ unsigned long arg);
#endif /* _SBUSLIB_H */