summaryrefslogtreecommitdiffstats
path: root/drivers/video/sbuslib.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-01-17 15:53:11 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-17 15:53:11 -0800
commitc7006638a50cbf16bb420fa91e5af2dd22d28621 (patch)
treeba8a5d030087634a2e0fe63ad6ce1cd9c6758bbf /drivers/video/sbuslib.h
parent1ae613883468eab2fb8a077aad9fdedfbfa73d1b (diff)
downloadop-kernel-dev-c7006638a50cbf16bb420fa91e5af2dd22d28621.zip
op-kernel-dev-c7006638a50cbf16bb420fa91e5af2dd22d28621.tar.gz
[SPARC]: Fix sbusfb build.
sbusfb_compat_ioctl() needs to return int, not long, as that is what the fb_ops->fb_compat_ioctl method prototype wants. Need to git rid of the "struct file *file" first argument to fbiogetputcmap() and fbiogscursor() to match calls done in sbusfb_compat_ioctl(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/sbuslib.h')
-rw-r--r--drivers/video/sbuslib.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/sbuslib.h b/drivers/video/sbuslib.h
index f753939..492828c 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 fb_info *info, unsigned int cmd,
+int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg);
#endif /* _SBUSLIB_H */
OpenPOWER on IntegriCloud