summaryrefslogtreecommitdiffstats
path: root/drivers/video/sbuslib.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2006-01-17 07:14:06 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 08:15:27 +0100
commit5ebdce726baf17eb66c5a1bf402ae6f161a082ed (patch)
treea8a5460f9096cf3f84975a634f377411d9ec0e11 /drivers/video/sbuslib.h
parent[PATCH] arm26: s/task_threas_info/task_thread_info/ (diff)
downloadlinux-5ebdce726baf17eb66c5a1bf402ae6f161a082ed.tar.xz
linux-5ebdce726baf17eb66c5a1bf402ae6f161a082ed.zip
[PATCH] fix up sbuslib for new fb_comapt_ioctl prototype
After ages my fb ioctl prototype cleanup finally got in. Unfortunately the patch are so old that the sbus compat_ioctl helper didn't exist back then, so it's not covered. This patch should fix that issue. Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Antonino A. 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/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..f753939013ed 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);
+long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
+ unsigned long arg);
#endif /* _SBUSLIB_H */