---

yaml --- r: 236150 b: refs/heads/master c: 85c3c56 h: refs/heads/master v: v3
git-mirror · Feb 28, 2011 · 6bb2e82 · 6bb2e82
1 parent 2871e1d
commit 6bb2e82
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: a2396dfc63d4b133d0b820db978065367529f6ac
+refs/heads/master: 85c3c562aa52d863e286049973cd508deb9f869a
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.c b/trunk/drivers/staging/xgifb/XGI_accel.c
@@ -123,12 +123,3 @@ void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 	cfb_fillrect(info, rect);
 	return;
 }
-
-void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area)
-{
-   	cfb_copyarea(info, area);
-	return;
-}
-
-
-
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.h b/trunk/drivers/staging/xgifb/XGI_accel.h
@@ -479,7 +479,5 @@ 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);
-void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area);
-
 
 #endif
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -795,8 +795,6 @@ static int      XGIfb_blank(int blank,
 */
 extern void     fbcon_XGI_fillrect(struct fb_info *info,
                                    const struct fb_fillrect *rect);
-extern void     fbcon_XGI_copyarea(struct fb_info *info,
-                                   const struct fb_copyarea *area);
 
 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
@@ -1739,7 +1739,7 @@ static struct fb_ops XGIfb_ops = {
 #endif
 	.fb_blank = XGIfb_blank,
 	.fb_fillrect = fbcon_XGI_fillrect,
-	.fb_copyarea = fbcon_XGI_copyarea,
+	.fb_copyarea = cfb_copyarea,
 	.fb_imageblit = cfb_imageblit,
 	.fb_ioctl = XGIfb_ioctl,
 	/* .fb_mmap = XGIfb_mmap, */