aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/xgifb/XGI_main.h2
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c2
-rw-r--r--drivers/staging/xgifb/XGIfb.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 896cf142456..e584f0b6543 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 = {
160 .xpanstep = 1, 160 .xpanstep = 1,
161 .ypanstep = 1, 161 .ypanstep = 1,
162}; 162};
163static u32 pseudo_palette[17];
164
165 163
166/* display status */ 164/* display status */
167static int XGIfb_crt1off; 165static int XGIfb_crt1off;
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
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 46b696f24c2..efcfac86500 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -61,6 +61,8 @@ struct xgifb_video_info {
61 int mode_idx; 61 int mode_idx;
62 int rate_idx; 62 int rate_idx;
63 63
64 u32 pseudo_palette[17];
65
64 int chip_id; 66 int chip_id;
65 unsigned int video_size; 67 unsigned int video_size;
66 unsigned long video_base; 68 unsigned long video_base;