From 6d92fc7de2cecc7e5b7dfc74733791a312bffd19 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 17 Jan 2006 15:53:11 -0800
Subject: [PATCH] --- yaml --- r: 18743 b: refs/heads/master c:
 c7006638a50cbf16bb420fa91e5af2dd22d28621 h: refs/heads/master i:   18741:
 97883afd849cb15fa0129e52dd53d52589619e08   18739:
 8406950cac3e7675d50168ef6ccb9fe8d9ab5c00   18735:
 8b4ac4700a806ef8189ace5e8660eaad5f606d57 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/video/sbuslib.c | 9 +++------
 trunk/drivers/video/sbuslib.h | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 10b0042ce912..4525bd561e01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ae613883468eab2fb8a077aad9fdedfbfa73d1b
+refs/heads/master: c7006638a50cbf16bb420fa91e5af2dd22d28621
diff --git a/trunk/drivers/video/sbuslib.c b/trunk/drivers/video/sbuslib.c
index 55e6e2d60d3a..a4d7cc51ce0b 100644
--- a/trunk/drivers/video/sbuslib.c
+++ b/trunk/drivers/video/sbuslib.c
@@ -199,8 +199,7 @@ struct  fbcmap32 {
 #define FBIOPUTCMAP32	_IOW('F', 3, struct fbcmap32)
 #define FBIOGETCMAP32	_IOW('F', 4, struct fbcmap32)
 
-static int fbiogetputcmap(struct file *file, struct fb_info *info,
-		unsigned int cmd, unsigned long arg)
+static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
 	struct fbcmap32 __user *argp = (void __user *)arg;
 	struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p));
@@ -236,8 +235,7 @@ struct fbcursor32 {
 #define FBIOSCURSOR32	_IOW('F', 24, struct fbcursor32)
 #define FBIOGCURSOR32	_IOW('F', 25, struct fbcursor32)
 
-static int fbiogscursor(struct file *file, struct fb_info *info,
-		unsigned long arg)
+static int fbiogscursor(struct fb_info *info, unsigned long arg)
 {
 	struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));
 	struct fbcursor32 __user *argp =  (void __user *)arg;
@@ -263,8 +261,7 @@ static int fbiogscursor(struct file *file, struct fb_info *info,
 	return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p);
 }
 
-long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
-		unsigned long arg)
+int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
 {
 	switch (cmd) {
 	case FBIOGTYPE:
diff --git a/trunk/drivers/video/sbuslib.h b/trunk/drivers/video/sbuslib.h
index f753939013ed..492828c3fe8f 100644
--- a/trunk/drivers/video/sbuslib.h
+++ b/trunk/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 */