---

yaml --- r: 268798 b: refs/heads/master c: 76cabaa h: refs/heads/master v: v3
git-mirror · Oct 12, 2011 · 9cd2948 · 9cd2948
1 parent a9aae9c
commit 9cd2948
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa55d9f97c63bbf53977e10154e2714e03586b2
+refs/heads/master: 76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791
diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h
@@ -160,8 +160,6 @@ static struct fb_fix_screeninfo XGIfb_fix = {
 	.xpanstep	= 1,
 	.ypanstep	= 1,
 };
-static u32 pseudo_palette[17];
-
 
 /* display status */
 static int XGIfb_crt1off;

diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -2390,7 +2390,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 	fb_info->screen_base = xgifb_info->video_vbase;
 	fb_info->fbops = &XGIfb_ops;
 	XGIfb_get_fix(&fb_info->fix, -1, fb_info);
-	fb_info->pseudo_palette = pseudo_palette;
+	fb_info->pseudo_palette = xgifb_info->pseudo_palette;
 
 	fb_alloc_cmap(&fb_info->cmap, 256 , 0);
 

diff --git a/trunk/drivers/staging/xgifb/XGIfb.h b/trunk/drivers/staging/xgifb/XGIfb.h
@@ -61,6 +61,8 @@ struct xgifb_video_info {
 	int mode_idx;
 	int rate_idx;
 
+	u32 pseudo_palette[17];
+
 	int           chip_id;
 	unsigned int  video_size;
 	unsigned long video_base;