aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGI_main_26.c
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-10-11 14:47:24 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-12 11:51:46 -0400
commit76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791 (patch)
tree969aee67e86ab8bfd4e13d4e27c26b997f83616c /drivers/staging/xgifb/XGI_main_26.c
parent5aa55d9f97c63bbf53977e10154e2714e03586b2 (diff)
staging: xgifb: move pseudo_palette into xgifb_video_info
pseudo_palette should be dynamically allocated for each fb. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index e89299c4ce6..45427d72027 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,
2390 fb_info->screen_base = xgifb_info->video_vbase; 2390 fb_info->screen_base = xgifb_info->video_vbase;
2391 fb_info->fbops = &XGIfb_ops; 2391 fb_info->fbops = &XGIfb_ops;
2392 XGIfb_get_fix(&fb_info->fix, -1, fb_info); 2392 XGIfb_get_fix(&fb_info->fix, -1, fb_info);
2393 fb_info->pseudo_palette = pseudo_palette; 2393 fb_info->pseudo_palette = xgifb_info->pseudo_palette;
2394 2394
2395 fb_alloc_cmap(&fb_info->cmap, 256 , 0); 2395 fb_alloc_cmap(&fb_info->cmap, 256 , 0);
2396 2396