From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Mon, 10 Mar 2008 18:43:37 +0000 (-0700)
Subject: tridentfb: fix memory size detection
X-Git-Tag: v2.6.25-rc6~80
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b614ce8b3c697947d75685f0b9f2059307dde715;p=linux-2.6-omap-h63xx.git

tridentfb: fix memory size detection

Fix memory size multiplier during detection.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 5976a1e4051..0a4e07d43d2 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -745,7 +745,7 @@ static unsigned int __devinit get_memsize(void)
 			switch (tmp) {
 
 			case 0x01:
-				k = 512;
+				k = 512 * Kb;
 				break;
 			case 0x02:
 				k = 6 * Mb;	/* XP */