[PATCH 8/9] staging: sm7xxfb: move pseudo palette into smtcfb_info
From: Javier M. Mellid
Date: Wed Jul 11 2012 - 09:50:45 EST
From: "Javier M. Mellid" <jmunhoz@xxxxxxxxxx>
This patch moves pseudo palette into smtcfb_info struct.
Tested with SM712.
Signed-off-by: Javier M. Mellid <jmunhoz@xxxxxxxxxx>
---
drivers/staging/sm7xxfb/sm7xxfb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 9dd2ef7..baee015 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;
}
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/