diff --git a/[refs] b/[refs]
index 1ac87d56f3fc..92b459723c36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a7c2e0d73511b1bd155e175b973a075de030043
+refs/heads/master: cd4653ae715321be0315d603e4c4ca2db8572493
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 1a273e73ab34..4ee9ca6148ec 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/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;
 }