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