---

yaml --- r: 236151 b: refs/heads/master c: 1b40296 h: refs/heads/master i: 236149: 2871e1d 236147: fdddaac 236143: c073fde v: v3
git-mirror · Feb 28, 2011 · a4c4de0 · a4c4de0
1 parent 6bb2e82
commit a4c4de0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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