]> err.no Git - linux-2.6/commitdiff
tridentfb: fix memory size detection
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Mon, 10 Mar 2008 18:43:37 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Mar 2008 01:01:18 +0000 (18:01 -0700)
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>
drivers/video/tridentfb.c

index 5976a1e405145febadbeb7916396be84e68cd2f0..0a4e07d43d2d44712e66477294175801b98e38fd 100644 (file)
@@ -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 */