From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 29 Aug 2011 20:14:27 +0000 (+0300)
Subject: staging: xgifb: assume the default video mode also when module
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69a186986111a31c0473971104e89c4975955e57;p=linux-beck.git

staging: xgifb: assume the default video mode also when module

The same default video mode should be assumed regardless if the driver
is a module or not. This won't change the current behaviour, but it will
simplify further changes.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index b65ed6e6b819..409b5150dcc7 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/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;