Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179338
b: refs/heads/master
c: 8a3a95c
h: refs/heads/master
v: v3
  • Loading branch information
Erik-Jan Post authored and Linus Torvalds committed Jan 16, 2010
1 parent 7ef1470 commit 1605d31
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: 0b94190e1e60f96962b82d35729d7d44cf298ef8
refs/heads/master: 8a3a95c32f612068be8dae74fa5fc4cf2db1592e
7 changes: 3 additions & 4 deletions trunk/drivers/video/via/viafbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,16 +177,15 @@ static int viafb_set_par(struct fb_info *info)
}

if (vmode_index != VIA_RES_INVALID) {
viafb_setmode(vmode_index, info->var.xres, info->var.yres,
info->var.bits_per_pixel, vmode_index1,
viafb_second_xres, viafb_second_yres, viafb_bpp1);

viafb_update_fix(info);
viafb_bpp = info->var.bits_per_pixel;
if (info->var.accel_flags & FB_ACCELF_TEXT)
info->flags &= ~FBINFO_HWACCEL_DISABLED;
else
info->flags |= FBINFO_HWACCEL_DISABLED;
viafb_setmode(vmode_index, info->var.xres, info->var.yres,
info->var.bits_per_pixel, vmode_index1,
viafb_second_xres, viafb_second_yres, viafb_bpp1);
}

return 0;
Expand Down

0 comments on commit 1605d31

Please sign in to comment.