diff --git a/[refs] b/[refs]
index 1cd39b1e6a5d..0f6294314ef7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1b7f9155ecaa52c4723dbcab8e95382935c9ad0
+refs/heads/master: 3f5042dfb4eedd11d5fbe10dda4605fe8d7890c1
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index edd9b614e202..eca5ed74feb5 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1994,10 +1994,6 @@ static int __init XGIfb_setup(char *options)
 			/* printk(KERN_INFO "XGIfb: Invalid option %s\n",
 				  this_opt); */
 		}
-
-		/* TW: Panning only with acceleration */
-		XGIfb_ypan = 0;
-
 	}
 	printk("\nxgifb: outa xgifb_setup 3450");
 	return 0;