git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
db1x00
/
init.c
diff --git
a/arch/mips/au1000/db1x00/init.c
b/arch/mips/au1000/db1x00/init.c
index
5ebe0de
..
8474135
100644
(file)
--- a/
arch/mips/au1000/db1x00/init.c
+++ b/
arch/mips/au1000/db1x00/init.c
@@
-57,6
+57,6
@@
void __init prom_init(void)
if (!memsize_str)
memsize = 0x04000000;
else
-
memsize = strict_strtol(memsize_str, 0, NULL
);
+
strict_strtol(memsize_str, 0, &memsize
);
add_memory_region(0, memsize, BOOT_MEM_RAM);
}