From b0d85eb1fe395d6aed2f6c8e09a12d85ec3be9b3 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 29 Aug 2011 23:14:26 +0300
Subject: [PATCH] --- yaml --- r: 268092 b: refs/heads/master c:
 a952cc9057d644be3cd2c7c9e8728346e4257f3c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1093da8e353c..9107e12835d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfbdf805798bb56acca75bdf7b1cad7818772dba
+refs/heads/master: a952cc9057d644be3cd2c7c9e8728346e4257f3c
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index a9dc9489e342..074fe4f9606e 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -458,17 +458,6 @@ static void XGIfb_search_mode(const char *name)
 {
 	int i = 0, j = 0, l;
 
-	if (name == NULL) {
-		printk(KERN_ERR "XGIfb: Internal error, using default mode.\n");
-		xgifb_mode_idx = DEFAULT_MODE;
-		if ((xgi_video_info.chip == XG21)
-				&& ((xgi_video_info.disp_state & DISPTYPE_DISP2)
-						== DISPTYPE_LCD)) {
-			xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx();
-		}
-		return;
-	}
-
 	if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) {
 		printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n");
 		xgifb_mode_idx = DEFAULT_MODE;