summaryrefslogtreecommitdiffstats
path: root/drivers/video/kyro
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-01-14 22:21:25 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 03:27:14 +0100
commit67a6680d64e18c7a1901f31ef747ea53b6cd986d (patch)
tree1d428eb19fdd393290348c63911c2974016ebc9d /drivers/video/kyro
parent[PATCH] gx1fb: (try to) play nicer with various BIOSes (diff)
downloadlinux-67a6680d64e18c7a1901f31ef747ea53b6cd986d.tar.xz
linux-67a6680d64e18c7a1901f31ef747ea53b6cd986d.zip
[PATCH] fbdev: Sanitize ->fb_ioctl prototype
The ioctl and file arguments to ->fb_mmap are totally unused and there's not reason a driver should need them. Also update the ->fb_compat_ioctl prototype to be the same as ->fb_mmap. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/kyro')
-rw-r--r--drivers/video/kyro/fbdev.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index bcd359b6d4ff..477ad297de4e 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -586,9 +586,8 @@ static int __init kyrofb_setup(char *options)
}
#endif
-static int kyrofb_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg,
- struct fb_info *info)
+static int kyrofb_ioctl(struct fb_info *info,
+ unsigned int cmd, unsigned long arg)
{
overlay_create ol_create;
overlay_viewport_set ol_viewport_set;