diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/aty/atyfb.h | 1 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h index dc62f8e282b4..7691e73823d3 100644 --- a/drivers/video/aty/atyfb.h +++ b/drivers/video/aty/atyfb.h | |||
@@ -126,6 +126,7 @@ union aty_pll { | |||
126 | */ | 126 | */ |
127 | 127 | ||
128 | struct atyfb_par { | 128 | struct atyfb_par { |
129 | u32 pseudo_palette[16]; | ||
129 | struct { u8 red, green, blue; } palette[256]; | 130 | struct { u8 red, green, blue; } palette[256]; |
130 | const struct aty_dac_ops *dac_ops; | 131 | const struct aty_dac_ops *dac_ops; |
131 | const struct aty_pll_ops *pll_ops; | 132 | const struct aty_pll_ops *pll_ops; |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index bc6f0096aa04..b537151136fc 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -541,8 +541,6 @@ static char ram_off[] __devinitdata = "OFF"; | |||
541 | #endif /* CONFIG_FB_ATY_CT */ | 541 | #endif /* CONFIG_FB_ATY_CT */ |
542 | 542 | ||
543 | 543 | ||
544 | static u32 pseudo_palette[16]; | ||
545 | |||
546 | #ifdef CONFIG_FB_ATY_GX | 544 | #ifdef CONFIG_FB_ATY_GX |
547 | static char *aty_gx_ram[8] __devinitdata = { | 545 | static char *aty_gx_ram[8] __devinitdata = { |
548 | ram_dram, ram_vram, ram_vram, ram_dram, | 546 | ram_dram, ram_vram, ram_vram, ram_dram, |
@@ -2577,7 +2575,7 @@ static int __devinit aty_init(struct fb_info *info) | |||
2577 | #endif | 2575 | #endif |
2578 | 2576 | ||
2579 | info->fbops = &atyfb_ops; | 2577 | info->fbops = &atyfb_ops; |
2580 | info->pseudo_palette = pseudo_palette; | 2578 | info->pseudo_palette = par->pseudo_palette; |
2581 | info->flags = FBINFO_DEFAULT | | 2579 | info->flags = FBINFO_DEFAULT | |
2582 | FBINFO_HWACCEL_IMAGEBLIT | | 2580 | FBINFO_HWACCEL_IMAGEBLIT | |
2583 | FBINFO_HWACCEL_FILLRECT | | 2581 | FBINFO_HWACCEL_FILLRECT | |