From fd8836874adf330ea601a2827ce0170e3636cf08 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:54 +0000
Subject: [PATCH] --- yaml --- r: 271231 b: refs/heads/master c:
 2bdb0278eec7bb466d2b1b31ecf6e48f10b34fbf h: refs/heads/master i:   271229:
 bed4ee3aa5f04760d8e3a20096ee0dd0888b08e2   271227:
 637c597c47fc2826845323cbdab3e58757149e8e   271223:
 e996f3d2289c743916b28f05d0192ac9f302b2a6   271215:
 884a4915cbb305fcdb3b750ce2412f47c1f4f855   271199:
 6949bb77020f63017f5ec331606b226626ae4a2f   271167:
 86881ae4d7646d35aaae13919c57676dbdcb3643   271103:
 c09c955e894276f830c6b8116c5c296d1b5e3b4c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/neofb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d12d89cd6798..7fc0d3d5009d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ee99f7e2edbd32501cb1fc0b701966d7cbe57e4
+refs/heads/master: 2bdb0278eec7bb466d2b1b31ecf6e48f10b34fbf
diff --git a/trunk/drivers/video/neofb.c b/trunk/drivers/video/neofb.c
index 588527a254c2..feea7b1dc386 100644
--- a/trunk/drivers/video/neofb.c
+++ b/trunk/drivers/video/neofb.c
@@ -1185,8 +1185,8 @@ static int neofb_pan_display(struct fb_var_screeninfo *var,
 
 	DBG("neofb_update_start");
 
-	Base = (var->yoffset * var->xres_virtual + var->xoffset) >> 2;
-	Base *= (var->bits_per_pixel + 7) / 8;
+	Base = (var->yoffset * info->var.xres_virtual + var->xoffset) >> 2;
+	Base *= (info->var.bits_per_pixel + 7) / 8;
 
 	neoUnlock();