From 02f8eb80a7707d5223fb2d9074e3f1e589ec7567 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 6 Dec 2011 00:10:47 +0200
Subject: [PATCH] --- yaml --- r: 281293 b: refs/heads/master c:
 776091018bf722eebc75c8be958bdd59f003e6f7 h: refs/heads/master i:   281291:
 8889e12849860e10afccf3659efe1e3296b87002 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_main.h    | 1 -
 trunk/drivers/staging/xgifb/XGI_main_26.c | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6748f5fc136f..497b811d9893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa56b2790a8bcef9b4241c2495c4e9347c10582e
+refs/heads/master: 776091018bf722eebc75c8be958bdd59f003e6f7
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index cf4c1889083d..35f7b2a485e1 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -124,7 +124,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
 /* display status */
 static int XGIfb_crt1off;
 static int XGIfb_forcecrt1 = -1;
-static int XGIfb_userom ;
 
 /* global flags */
 static int XGIfb_tvmode;
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 185955a693b0..5c76ee7b1066 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1875,8 +1875,6 @@ static int __init XGIfb_setup(char *options)
 			XGIfb_crt2type = XGIFB_DISP_LCD;
 		} else if (!strncmp(this_opt, "noypan", 6)) {
 			XGIfb_ypan = 0;
-		} else if (!strncmp(this_opt, "userom:", 7)) {
-			XGIfb_userom = xgifb_optval(this_opt, 7);
 		} else {
 			mode = this_opt;
 		}