From 69e7e0dc3a9e6f05808473168739de040567466d Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Mon, 28 Feb 2011 20:59:25 +0200 Subject: [PATCH] --- yaml --- r: 236154 b: refs/heads/master c: 6653eb317facd4f020ca0a0378867d6f33f9a921 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ea00d2c967ea..5abfc07c4ad9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26046bc16acb3141bd7634458f3f2ed0e56846b3 +refs/heads/master: 6653eb317facd4f020ca0a0378867d6f33f9a921 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index f2a4a2a6bd71..c569d9744e81 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -3435,7 +3435,6 @@ static char *forcecrt2type = NULL; static int forcecrt1 = -1; static int pdc = -1; static int pdc1 = -1; -static int noaccel = -1; static int noypan = -1; static int nomax = -1; static int userom = -1; @@ -3456,7 +3455,6 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("XGITECH , Others"); module_param(mem, int, 0); -module_param(noaccel, int, 0); module_param(noypan, int, 0); module_param(nomax, int, 0); module_param(userom, int, 0); @@ -3490,10 +3488,6 @@ MODULE_PARM_DESC(mem, "The value is to be specified without 'KB' and must match the MaxXFBMem setting\n" "for XFree86 4.x/X.org 6.7 and later.\n"); -MODULE_PARM_DESC(noaccel, - "\nIf set to anything other than 0, 2D acceleration will be disabled.\n" - "(default: 0)\n"); - MODULE_PARM_DESC(noypan, "\nIf set to anything other than 0, y-panning will be disabled and scrolling\n" "will be performed by redrawing the screen. (default: 0)\n");