Skip to content

Commit

Permalink
staging: sm7xxfb: move pseudo palette into smtcfb_info
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Javier M. Mellid authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent 4a7c2e0 commit cd4653a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/sm7xxfb/sm7xxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit cd4653a

Please sign in to comment.