From a8896b1e88b1e1b58e90501fb6076836593b2044 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 29 Aug 2011 23:14:27 +0300
Subject: [PATCH] --- yaml --- r: 268093 b: refs/heads/master c:
 69a186986111a31c0473971104e89c4975955e57 h: refs/heads/master i:   268091:
 76a701a6c18251e1747c176d390b034b81b1488c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/xgifb/XGI_main.h | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9107e12835d3..2d5139f03c52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a952cc9057d644be3cd2c7c9e8728346e4257f3c
+refs/heads/master: 69a186986111a31c0473971104e89c4975955e57
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index b65ed6e6b819..409b5150dcc7 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -364,12 +364,7 @@ static struct _XGIbios_mode {
 };
 
 /* mode-related variables */
-#ifdef MODULE
-static int xgifb_mode_idx = 1;
-#else
-static int xgifb_mode_idx = -1; /* Use a default mode if we are
-					inside the kernel */
-#endif
+static int xgifb_mode_idx = -1;
 static u8  XGIfb_mode_no;
 static u8  XGIfb_rate_idx;