Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317977
b: refs/heads/master
c: 13a05ea
h: refs/heads/master
i:
  317975: d7d38da
v: v3
  • Loading branch information
Javier M. Mellid authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent b8d94d6 commit a0ba3ea
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cd4653ae715321be0315d603e4c4ca2db8572493
refs/heads/master: 13a05eaa9d4adf25dc199246eedbe2a211cffb6c
36 changes: 18 additions & 18 deletions trunk/drivers/staging/sm7xxfb/sm7xxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ static struct fb_ops smtcfb_ops = {
};

/*
* Alloc struct smtcfb_info and assign the default value
* alloc struct smtcfb_info and assign the default value
*/
static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name)
{
Expand All @@ -686,30 +686,30 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name)

sfb->pdev = pdev;

/*** Init sfb->fb with default value ***/
/* init sfb->fb with default value */

sfb->fb.flags = FBINFO_FLAG_DEFAULT;
sfb->fb.fbops = &smtcfb_ops;
sfb->fb.var = smtcfb_var;
sfb->fb.fix = smtcfb_fix;

sfb->fb.fix = smtcfb_fix;
strcpy(sfb->fb.fix.id, name);

sfb->fb.fix.type = FB_TYPE_PACKED_PIXELS;
sfb->fb.fix.type_aux = 0;
sfb->fb.fix.xpanstep = 0;
sfb->fb.fix.ypanstep = 0;
sfb->fb.fix.ywrapstep = 0;
sfb->fb.fix.accel = FB_ACCEL_SMI_LYNX;

sfb->fb.var.nonstd = 0;
sfb->fb.var.activate = FB_ACTIVATE_NOW;
sfb->fb.var.height = -1;
sfb->fb.var.width = -1;
/* text mode acceleration */
sfb->fb.fix.type = FB_TYPE_PACKED_PIXELS;
sfb->fb.fix.type_aux = 0;
sfb->fb.fix.xpanstep = 0;
sfb->fb.fix.ypanstep = 0;
sfb->fb.fix.ywrapstep = 0;
sfb->fb.fix.accel = FB_ACCEL_SMI_LYNX;

sfb->fb.var = smtcfb_var;
sfb->fb.var.nonstd = 0;
sfb->fb.var.activate = FB_ACTIVATE_NOW;
sfb->fb.var.height = -1;
sfb->fb.var.width = -1;
sfb->fb.var.accel_flags = FB_ACCELF_TEXT;
sfb->fb.var.vmode = FB_VMODE_NONINTERLACED;
sfb->fb.var.vmode = FB_VMODE_NONINTERLACED;

sfb->fb.pseudo_palette = sfb->colreg;
sfb->fb.pseudo_palette = sfb->colreg;

sfb->fb.par = sfb;

Expand Down

0 comments on commit a0ba3ea

Please sign in to comment.