From a4c4de06fdb25e0c04fa2b2761ac32a4cdfbc02e Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 28 Feb 2011 20:59:22 +0200
Subject: [PATCH] --- yaml --- r: 236151 b: refs/heads/master c:
 1b402967bc0ba7a8b0dd075e6c69c137f227a1eb h: refs/heads/master i:   236149:
 2871e1d8b0f70825b1be19e0ad4d3f03519566c4   236147:
 fdddaac0dbe45e3aaf7784b27cbaa575373d793a   236143:
 c073fde00e08b993255aa0b18594a1d83776d1fb v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_accel.c   | 9 ---------
 trunk/drivers/staging/xgifb/XGI_accel.h   | 2 --
 trunk/drivers/staging/xgifb/XGI_main.h    | 2 --
 trunk/drivers/staging/xgifb/XGI_main_26.c | 2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index deeeb0ef7479..8216329aa92c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85c3c562aa52d863e286049973cd508deb9f869a
+refs/heads/master: 1b402967bc0ba7a8b0dd075e6c69c137f227a1eb
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.c b/trunk/drivers/staging/xgifb/XGI_accel.c
index 968ac04c4d52..1e4c06c8198b 100644
--- a/trunk/drivers/staging/xgifb/XGI_accel.c
+++ b/trunk/drivers/staging/xgifb/XGI_accel.c
@@ -114,12 +114,3 @@ void XGIfb_syncaccel(void)
     XGI310Sync();
 
 }
-
-void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
-{
-	if (!rect->width || !rect->height)
-		return;
-
-	cfb_fillrect(info, rect);
-	return;
-}
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.h b/trunk/drivers/staging/xgifb/XGI_accel.h
index 836ee40cbf7f..a1fb5d39b153 100644
--- a/trunk/drivers/staging/xgifb/XGI_accel.h
+++ b/trunk/drivers/staging/xgifb/XGI_accel.h
@@ -478,6 +478,4 @@ int fbcon_XGI_sync(struct fb_info *info);
 
 extern struct video_info xgi_video_info;
 
-void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
-
 #endif
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index 15d72eece878..39e15ded7f4f 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -793,8 +793,6 @@ static int      XGIfb_blank(int blank,
 /*static int 	XGIfb_mmap(struct fb_info *info, struct file *file,
 		           struct vm_area_struct *vma);
 */
-extern void     fbcon_XGI_fillrect(struct fb_info *info,
-                                   const struct fb_fillrect *rect);
 
 static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd,
 			    unsigned long arg);
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 6cf2eea0871b..fa97c3796a01 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1738,7 +1738,7 @@ static struct fb_ops XGIfb_ops = {
 	.fb_pan_display = XGIfb_pan_display,
 #endif
 	.fb_blank = XGIfb_blank,
-	.fb_fillrect = fbcon_XGI_fillrect,
+	.fb_fillrect = cfb_fillrect,
 	.fb_copyarea = cfb_copyarea,
 	.fb_imageblit = cfb_imageblit,
 	.fb_ioctl = XGIfb_ioctl,