diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 16:29:51 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 16:29:51 +1100 |
| commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /arch/mips/alchemy/xxs1500/init.c | |
| parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
| download | linux-cb7a97d01521797cad9f63e8478403c3e51fea49.tar.gz linux-cb7a97d01521797cad9f63e8478403c3e51fea49.tar.bz2 linux-cb7a97d01521797cad9f63e8478403c3e51fea49.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/mips/alchemy/xxs1500/init.c')
| -rw-r--r-- | arch/mips/alchemy/xxs1500/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/alchemy/xxs1500/init.c b/arch/mips/alchemy/xxs1500/init.c index 7516434760a1..456fa142c093 100644 --- a/arch/mips/alchemy/xxs1500/init.c +++ b/arch/mips/alchemy/xxs1500/init.c @@ -53,6 +53,6 @@ void __init prom_init(void) if (!memsize_str) memsize = 0x04000000; else - strict_strtol(memsize_str, 0, &memsize); + strict_strtoul(memsize_str, 0, &memsize); add_memory_region(0, memsize, BOOT_MEM_RAM); } |