From 868fab49117daff85286fa42f811cb7a16f61020 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Tue, 11 Oct 2011 21:47:14 +0300
Subject: [PATCH] --- yaml --- r: 268788 b: refs/heads/master c:
 19c1e88e02c63008745c8549513e53df4aac868f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f7bbdc9ad383..1c5b186993f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54301b5cfe3c16002ab25762a8cd2186beee4a75
+refs/heads/master: 19c1e88e02c63008745c8549513e53df4aac868f
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
index 467df83860ad..dacef51e9ff5 100644
--- a/trunk/drivers/staging/xgifb/XGI_main.h
+++ b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -125,9 +125,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
 
 /* ------------------- Global Variables ----------------------------- */
 
-/* Fbcon variables */
-static struct fb_info *fb_info;
-
 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 6957b65c11df..f7c0afe7fc78 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1986,12 +1986,14 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 	u8 CR48, CR38;
 	int ret;
 	bool xgi21_drvlcdcaplist = false;
+	struct fb_info *fb_info;
 
 	memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
 	fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
 	if (!fb_info)
 		return -ENOMEM;
 
+	xgi_video_info.fb_info = fb_info;
 	xgi_video_info.chip_id = pdev->device;
 	pci_read_config_byte(pdev,
 			     PCI_REVISION_ID,
@@ -2447,6 +2449,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 static void __devexit xgifb_remove(struct pci_dev *pdev)
 {
 	struct video_info *xgifb_info = pci_get_drvdata(pdev);
+	struct fb_info *fb_info = xgifb_info->fb_info;
 
 	unregister_framebuffer(fb_info);
 #ifdef CONFIG_MTRR
diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h
index f778293b553e..83a191173081 100644
--- a/trunk/drivers/staging/xgifb/XGIfb.h
+++ b/trunk/drivers/staging/xgifb/XGIfb.h
@@ -53,6 +53,8 @@ enum xgi_tv_plug { /* vicki@030226 */
 };
 
 struct video_info {
+	struct fb_info *fb_info;
+
 	int           chip_id;
 	unsigned int  video_size;
 	unsigned long video_base;