From: Geert Uytterhoeven atyfb: Move the pseudo palette into the card-specific atyfb_par, so it's no longer shared among multiple cards Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/aty/atyfb.h | 1 + drivers/video/aty/atyfb_base.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/video/aty/atyfb.h~atyfb-atyfb-unshare-pseudo_palette drivers/video/aty/atyfb.h --- a/drivers/video/aty/atyfb.h~atyfb-atyfb-unshare-pseudo_palette +++ a/drivers/video/aty/atyfb.h @@ -126,6 +126,7 @@ union aty_pll { */ struct atyfb_par { + u32 pseudo_palette[16]; struct { u8 red, green, blue; } palette[256]; const struct aty_dac_ops *dac_ops; const struct aty_pll_ops *pll_ops; diff -puN drivers/video/aty/atyfb_base.c~atyfb-atyfb-unshare-pseudo_palette drivers/video/aty/atyfb_base.c --- a/drivers/video/aty/atyfb_base.c~atyfb-atyfb-unshare-pseudo_palette +++ a/drivers/video/aty/atyfb_base.c @@ -541,8 +541,6 @@ static char ram_off[] __devinitdata = "O #endif /* CONFIG_FB_ATY_CT */ -static u32 pseudo_palette[16]; - #ifdef CONFIG_FB_ATY_GX static char *aty_gx_ram[8] __devinitdata = { ram_dram, ram_vram, ram_vram, ram_dram, @@ -2577,7 +2575,7 @@ static int __devinit aty_init(struct fb_ #endif info->fbops = &atyfb_ops; - info->pseudo_palette = pseudo_palette; + info->pseudo_palette = par->pseudo_palette; info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT | _