From 3f5042dfb4eedd11d5fbe10dda4605fe8d7890c1 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 29 Aug 2011 23:14:18 +0300
Subject: [PATCH] staging: xgifb: fix ypan disable option

Setting any of the FB options will disable ypan as a side effect. It
should be disabled only by the "noypan" option.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/xgifb/XGI_main_26.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index edd9b614e202..eca5ed74feb5 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/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;