From beedc917f2e145c821c63f861391e6885e785176 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Fri, 19 Aug 2011 22:40:27 +0300
Subject: [PATCH] --- yaml --- r: 267577 b: refs/heads/master c:
 de351ba690422fbee2a8c01031ef0eb6fd75cfc0 h: refs/heads/master i:   267575:
 4ed2a628a74ec9d53a5d40f4a555bc6ad6b5ffab v: v3

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

diff --git a/[refs] b/[refs]
index 397879ee2d48..d21f6e3ce6c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1521a166d2cb2551a41fa2a697f92e661500cdd
+refs/heads/master: de351ba690422fbee2a8c01031ef0eb6fd75cfc0
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index 44b7adc672c6..39893ca78143 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -132,9 +132,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
 /* Fbcon variables */
 static struct fb_info *fb_info;
 
-
-static int    video_type = FB_TYPE_PACKED_PIXELS;
-
 static struct fb_var_screeninfo default_var = {
 	.xres		= 0,
 	.yres		= 0,
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 630f447b461b..4415d4aedbec 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1487,7 +1487,7 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
 
 	fix->smem_len = xgi_video_info.video_size;
 
-	fix->type = video_type;
+	fix->type = FB_TYPE_PACKED_PIXELS;
 	fix->type_aux = 0;
 	if (xgi_video_info.video_bpp == 8)
 		fix->visual = FB_VISUAL_PSEUDOCOLOR;