diff --git a/[refs] b/[refs]
index 638e64a4a1e8..3fda07271323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 522f1f63cfca29a14ff5efacac9c2cce69d8508b
+refs/heads/master: da1545c0f2e5be5702ca37ad6fcddb3fa0d5094e
diff --git a/trunk/drivers/staging/xgifb/XGI_accel.c b/trunk/drivers/staging/xgifb/XGI_accel.c
index 7c69e0711a90..905b34ae5e9b 100644
--- a/trunk/drivers/staging/xgifb/XGI_accel.c
+++ b/trunk/drivers/staging/xgifb/XGI_accel.c
@@ -115,11 +115,6 @@ void XGIfb_syncaccel(void)
 
 }
 
-int fbcon_XGI_sync(struct fb_info *info)
-{
-	return 0;
-}
-
 void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
 	if (!rect->width || !rect->height)
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index e8e2bfe75573..1b454148cb78 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -797,7 +797,6 @@ 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);
-extern int      fbcon_XGI_sync(struct fb_info *info);
 
 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 b52e11f3e4c6..c77ac4ad5094 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1741,7 +1741,6 @@ static struct fb_ops XGIfb_ops = {
 	.fb_fillrect = fbcon_XGI_fillrect,
 	.fb_copyarea = fbcon_XGI_copyarea,
 	.fb_imageblit = cfb_imageblit,
-	.fb_sync = fbcon_XGI_sync,
 	.fb_ioctl = XGIfb_ioctl,
 	/* .fb_mmap = XGIfb_mmap, */
 };