Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38072
b: refs/heads/master
c: 5c60b11
h: refs/heads/master
v: v3
  • Loading branch information
Raphael Assenat authored and Linus Torvalds committed Oct 3, 2006
1 parent b35bad5 commit 04d3715
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 8bc218410d6c2b22a7581fac6f3dc2ac1f8fc99f
refs/heads/master: 5c60b118d62c14ad7586ed6a6e537c3294c90227
8 changes: 4 additions & 4 deletions trunk/drivers/video/mbx/mbxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ static int mbxfb_set_par(struct fb_info *info)

/* setup resolution */
gsctrl &= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));
gsctrl |= Gsctrl_Width(info->var.xres - 1) |
Gsctrl_Height(info->var.yres - 1);
gsctrl |= Gsctrl_Width(info->var.xres) |
Gsctrl_Height(info->var.yres);
writel(gsctrl, GSCTRL);
udelay(1000);

Expand Down Expand Up @@ -413,8 +413,8 @@ static void __devinit setup_graphics(struct fb_info *fbi)
{
unsigned long gsctrl;

gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres - 1) |
Gsctrl_Height(fbi->var.yres - 1);
gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres) |
Gsctrl_Height(fbi->var.yres);
switch (fbi->var.bits_per_pixel) {
case 16:
if (fbi->var.green.length == 5)
Expand Down

0 comments on commit 04d3715

Please sign in to comment.