aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/xgifb/XGI_main.h
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-08-29 23:14:27 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-06 11:41:23 -0700
commit69a186986111a31c0473971104e89c4975955e57 (patch)
tree452160d353a6cc7110c6b51986f9f16c026ca6aa /drivers/staging/xgifb/XGI_main.h
parenta952cc9057d644be3cd2c7c9e8728346e4257f3c (diff)
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>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main.h')
-rw-r--r--drivers/staging/xgifb/XGI_main.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index b65ed6e6b81..409b5150dcc 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;