From 01017cdf0a8ba1c9ebbdef7514d17061cf2304b1 Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Mon, 17 Sep 2012 16:12:47 +0200 Subject: [PATCH] --- yaml --- r: 325377 b: refs/heads/master c: d459a03b90ae2895d0726b9a6f5147efa30ca11f h: refs/heads/master i: 325375: eaca102308de1c3c6db6a2d9f4e40bb8b7542555 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 21 +++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 28818f9290e6..03a662e623bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d3616bb1902eaf9f096731fe06f9e5c033914b6 +refs/heads/master: d459a03b90ae2895d0726b9a6f5147efa30ca11f diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index d935c23456e8..b809e2caf5f2 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -72,6 +72,8 @@ static struct fb_var_screeninfo smtcfb_var = { .height = -1, .width = -1, .vmode = FB_VMODE_NONINTERLACED, + .nonstd = 0, + .accel_flags = FB_ACCELF_TEXT, }; static struct fb_fix_screeninfo smtcfb_fix = { @@ -80,6 +82,10 @@ static struct fb_fix_screeninfo smtcfb_fix = { .visual = FB_VISUAL_TRUECOLOR, .line_length = 800 * 3, .accel = FB_ACCEL_SMI_LYNX, + .type_aux = 0, + .xpanstep = 0, + .ypanstep = 0, + .ywrapstep = 0, }; struct vesa_mode { @@ -694,20 +700,7 @@ static struct smtcfb_info *smtc_alloc_fb_info(struct pci_dev *pdev, char *name) 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 = 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 = smtcfb_var; sfb->fb.pseudo_palette = sfb->colreg;