From 47c2f9db23f181ba2159c3ad8c25471bbb8b0bdc Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 29 Aug 2011 23:14:19 +0300
Subject: [PATCH] --- yaml --- r: 268085 b: refs/heads/master c:
 20fc30b9412013f96005e5d8de6af6c555d6650f h: refs/heads/master i:   268083:
 099278b04b07f554f24fe7ab2ef0b99d4daeb65f v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/xgifb/XGI_main_26.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0f6294314ef7..8cb959f52b5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f5042dfb4eedd11d5fbe10dda4605fe8d7890c1
+refs/heads/master: 20fc30b9412013f96005e5d8de6af6c555d6650f
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index eca5ed74feb5..ceb0883ebf05 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1954,11 +1954,6 @@ static int __init XGIfb_setup(char *options)
 		} else if (!strncmp(this_opt, "vesa:", 5)) {
 			XGIfb_search_vesamode(simple_strtoul(
 						this_opt + 5, NULL, 0));
-		} else if (!strncmp(this_opt, "mode:", 5)) {
-			XGIfb_search_mode(this_opt + 5);
-		} else if (!strncmp(this_opt, "vesa:", 5)) {
-			XGIfb_search_vesamode(simple_strtoul(
-						this_opt + 5, NULL, 0));
 		} else if (!strncmp(this_opt, "vrate:", 6)) {
 			xgi_video_info.refresh_rate = simple_strtoul(
 						this_opt + 6, NULL, 0);