aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-03-10 14:43:37 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-10 21:01:18 -0400
commitb614ce8b3c697947d75685f0b9f2059307dde715 (patch)
treec898df0daac662800acfceb456905fe0a881bf6f /drivers/video
parent3acd9d462062bb332073fde90bf9d118ac5a043d (diff)
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/video')
-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)
745 switch (tmp) { 745 switch (tmp) {
746 746
747 case 0x01: 747 case 0x01:
748 k = 512; 748 k = 512 * Kb;
749 break; 749 break;
750 case 0x02: 750 case 0x02:
751 k = 6 * Mb; /* XP */ 751 k = 6 * Mb; /* XP */