diff --git a/[refs] b/[refs] index 82be498cdb19..735e9195c156 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55a0dd83eb24a89fd448006aaa9326df643861ae +refs/heads/master: 3b921832d483a2b9d6fabdbb5f871a4f18cb9b65 diff --git a/trunk/drivers/video/cirrusfb.c b/trunk/drivers/video/cirrusfb.c index 245005e61e40..9e0a1c58fde4 100644 --- a/trunk/drivers/video/cirrusfb.c +++ b/trunk/drivers/video/cirrusfb.c @@ -657,7 +657,7 @@ static int cirrusfb_decode_var(const struct fb_var_screeninfo *var, case 16: case 32: info->fix.line_length = var->xres_virtual * maxclockidx; - info->fix.visual = FB_VISUAL_DIRECTCOLOR; + info->fix.visual = FB_VISUAL_TRUECOLOR; break; default: @@ -1178,10 +1178,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info) case BT_ALPINE: DPRINTK(" (for GD543x)\n"); - if (var->xres >= 1024) - vga_wseq(regbase, CL_SEQR7, 0xa7); - else - vga_wseq(regbase, CL_SEQR7, 0xa3); + vga_wseq(regbase, CL_SEQR7, 0xa7); cirrusfb_set_mclk(cinfo, regs.mclk, regs.divMCLK); break;