From e8bd023fa767c14abfae089e88cb75404a0d5baa Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 25 May 2011 11:34:52 +0200
Subject: [PATCH] --- yaml --- r: 271205 b: refs/heads/master c:
 3bb8c31dea4f4fe41c954e1a02ac3cdd8ee6747f h: refs/heads/master i:   271203:
 977afdd070c6c1355b4337f7d4e1ae86a75a992e v: v3

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

diff --git a/[refs] b/[refs]
index 4dc6ee50c222..0ff671e2f720 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4935ebf43cedadcaffa56cd59449c8b6dda6d507
+refs/heads/master: 3bb8c31dea4f4fe41c954e1a02ac3cdd8ee6747f
diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c
index 27f93aab6ddc..f4f8ce802d02 100644
--- a/trunk/drivers/video/pm2fb.c
+++ b/trunk/drivers/video/pm2fb.c
@@ -973,8 +973,8 @@ static int pm2fb_pan_display(struct fb_var_screeninfo *var,
 {
 	struct pm2fb_par *p = info->par;
 	u32 base;
-	u32 depth = (var->bits_per_pixel + 7) & ~7;
-	u32 xres = (var->xres + 31) & ~31;
+	u32 depth = (info->var.bits_per_pixel + 7) & ~7;
+	u32 xres = (info->var.xres + 31) & ~31;
 
 	depth = (depth > 32) ? 32 : depth;
 	base = to3264(var->yoffset * xres + var->xoffset, depth, 1);