diff options
Diffstat (limited to 'arch/mips/au1000/xxs1500/init.c')
-rw-r--r-- | arch/mips/au1000/xxs1500/init.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c index 24fc6e132dc0..b849bf501c04 100644 --- a/arch/mips/au1000/xxs1500/init.c +++ b/arch/mips/au1000/xxs1500/init.c | |||
@@ -2,9 +2,8 @@ | |||
2 | * BRIEF MODULE DESCRIPTION | 2 | * BRIEF MODULE DESCRIPTION |
3 | * XXS1500 board setup | 3 | * XXS1500 board setup |
4 | * | 4 | * |
5 | * Copyright 2003 MontaVista Software Inc. | 5 | * Copyright 2003, 2008 MontaVista Software Inc. |
6 | * Author: MontaVista Software, Inc. | 6 | * Author: MontaVista Software, Inc. <source@mvista.com> |
7 | * ppopov@mvista.com or source@mvista.com | ||
8 | * | 7 | * |
9 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
10 | * under the terms of the GNU General Public License as published by the | 9 | * under the terms of the GNU General Public License as published by the |
@@ -45,8 +44,8 @@ void __init prom_init(void) | |||
45 | unsigned long memsize; | 44 | unsigned long memsize; |
46 | 45 | ||
47 | prom_argc = fw_arg0; | 46 | prom_argc = fw_arg0; |
48 | prom_argv = (char **) fw_arg1; | 47 | prom_argv = (char **)fw_arg1; |
49 | prom_envp = (char **) fw_arg2; | 48 | prom_envp = (char **)fw_arg2; |
50 | 49 | ||
51 | prom_init_cmdline(); | 50 | prom_init_cmdline(); |
52 | 51 | ||
@@ -54,6 +53,6 @@ void __init prom_init(void) | |||
54 | if (!memsize_str) | 53 | if (!memsize_str) |
55 | memsize = 0x04000000; | 54 | memsize = 0x04000000; |
56 | else | 55 | else |
57 | memsize = simple_strtol(memsize_str, NULL, 0); | 56 | memsize = strict_strtol(memsize_str, 0, NULL); |
58 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 57 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
59 | } | 58 | } |