staging: sm7xxfb: move pseudo palette into smtcfb_info

This patch moves pseudo palette into smtcfb_info struct.

Tested with SM712.

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 1a273e73ab34894d57cd369cb4e2981a738dbe5b..4ee9ca6148ec6061123fb4a8bbb5978cf63baf72 100644 (file)
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -52,13 +52,13 @@ struct smtcfb_info {
        u_int width;
        u_int height;
        u_int hz;
+
+       u32 colreg[17];
 };
 
 char __iomem *smtc_RegBaseAddress;     /* Memory Map IO starting address */
 char __iomem *smtc_VRAMBaseAddress;    /* video memory starting address */
 
-static u32 colreg[17];
-
 static struct fb_var_screeninfo smtcfb_var = {
        .xres           = 1024,
        .yres           = 600,
@@ -709,9 +709,9 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name)
        sfb->fb.var.accel_flags = FB_ACCELF_TEXT;
        sfb->fb.var.vmode = FB_VMODE_NONINTERLACED;
 
-       sfb->fb.par = sfb;
+       sfb->fb.pseudo_palette = sfb->colreg;
 
-       sfb->fb.pseudo_palette = colreg;
+       sfb->fb.par = sfb;
 
        return sfb;
 }