summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-03-10 19:43:37 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-11 02:01:18 +0100
commitb614ce8b3c697947d75685f0b9f2059307dde715 (patch)
treec898df0daac662800acfceb456905fe0a881bf6f /drivers
parenttridentfb: register should be left in non-locked state (diff)
downloadlinux-b614ce8b3c697947d75685f0b9f2059307dde715.tar.xz
linux-b614ce8b3c697947d75685f0b9f2059307dde715.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/tridentfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 5976a1e40514..0a4e07d43d2d 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 */