summaryrefslogtreecommitdiff
path: root/drivers/staging/sm7xxfb
diff options
context:
space:
mode:
authorJavier M. Mellid <jmunhoz@igalia.com>2012-07-11 15:49:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 18:50:17 -0700
commitcd4653ae715321be0315d603e4c4ca2db8572493 (patch)
tree5e2c044b513439a3e0dc365cacc47f6ca4fa7b12 /drivers/staging/sm7xxfb
parent4a7c2e0d73511b1bd155e175b973a075de030043 (diff)
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>
Diffstat (limited to 'drivers/staging/sm7xxfb')
-rw-r--r--drivers/staging/sm7xxfb/sm7xxfb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 1a273e73ab34..4ee9ca6148ec 100644
--- 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;
}