diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-06-21 16:43:50 -0400 |
|---|---|---|
| committer | Auke-jan Kok <ahkok@gitlost.site> | 2006-06-21 16:43:50 -0400 |
| commit | 0d204094d15dac2e8a439b993f71eda385b4dccd (patch) | |
| tree | 647f0ddec94d0fb4aaf74fa55bcad75946030f8a /drivers/video/console/fbcon.c | |
| parent | a487a8f7b6947f6445e5a1aa876522916785d5ec (diff) | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 953eb8c171d6..47ba1a79adcd 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -1745,7 +1745,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir, | |||
| 1745 | fbcon_redraw_move(vc, p, 0, t, count); | 1745 | fbcon_redraw_move(vc, p, 0, t, count); |
| 1746 | ypan_up_redraw(vc, t, count); | 1746 | ypan_up_redraw(vc, t, count); |
| 1747 | if (vc->vc_rows - b > 0) | 1747 | if (vc->vc_rows - b > 0) |
| 1748 | fbcon_redraw_move(vc, p, b - count, | 1748 | fbcon_redraw_move(vc, p, b, |
| 1749 | vc->vc_rows - b, b); | 1749 | vc->vc_rows - b, b); |
| 1750 | } else | 1750 | } else |
| 1751 | fbcon_redraw_move(vc, p, t + count, b - t - count, t); | 1751 | fbcon_redraw_move(vc, p, t + count, b - t - count, t); |