From: Aaro Koskinen Date: Tue, 11 Oct 2011 18:47:24 +0000 (+0300) Subject: staging: xgifb: move pseudo_palette into xgifb_video_info X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791;p=linux-beck.git staging: xgifb: move pseudo_palette into xgifb_video_info pseudo_palette should be dynamically allocated for each fb. Signed-off-by: Aaro Koskinen Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 896cf1424564..e584f0b65439 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/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/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index e89299c4ce69..45427d720274 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/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/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h index 46b696f24c2d..efcfac865001 100644 --- a/drivers/staging/xgifb/XGIfb.h +++ b/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;