Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218517
b: refs/heads/master
c: c9c62dc
h: refs/heads/master
i:
  218515: f5283af
v: v3
  • Loading branch information
James Hogan authored and Linus Torvalds committed Oct 28, 2010
1 parent 724e31a commit d152d89
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: 847fb8aca3b79d03ef6c5f87f0843a30ed9e6627
refs/heads/master: c9c62dce35e7fc54beebafb071393a0008989e49
14 changes: 7 additions & 7 deletions trunk/drivers/video/fbmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -877,13 +877,13 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var)

if ((err = info->fbops->fb_pan_display(var, info)))
return err;
info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;
if (var->vmode & FB_VMODE_YWRAP)
info->var.vmode |= FB_VMODE_YWRAP;
else
info->var.vmode &= ~FB_VMODE_YWRAP;
return 0;
info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;
if (var->vmode & FB_VMODE_YWRAP)
info->var.vmode |= FB_VMODE_YWRAP;
else
info->var.vmode &= ~FB_VMODE_YWRAP;
return 0;
}

static int fb_check_caps(struct fb_info *info, struct fb_var_screeninfo *var,
Expand Down

0 comments on commit d152d89

Please sign in to comment.