diff options
Diffstat (limited to 'arch/mips/au1000/mtx-1/init.c')
-rw-r--r-- | arch/mips/au1000/mtx-1/init.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c index c015cbce1cca..33a4aebe0cba 100644 --- a/arch/mips/au1000/mtx-1/init.c +++ b/arch/mips/au1000/mtx-1/init.c | |||
@@ -3,9 +3,8 @@ | |||
3 | * BRIEF MODULE DESCRIPTION | 3 | * BRIEF MODULE DESCRIPTION |
4 | * 4G Systems MTX-1 board setup | 4 | * 4G Systems MTX-1 board setup |
5 | * | 5 | * |
6 | * Copyright 2003 MontaVista Software Inc. | 6 | * Copyright 2003, 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 | * Bruno Randolf <bruno.randolf@4g-systems.biz> | 8 | * Bruno Randolf <bruno.randolf@4g-systems.biz> |
10 | * | 9 | * |
11 | * This program is free software; you can redistribute it and/or modify it | 10 | * This program is free software; you can redistribute it and/or modify it |
@@ -47,8 +46,8 @@ void __init prom_init(void) | |||
47 | unsigned long memsize; | 46 | unsigned long memsize; |
48 | 47 | ||
49 | prom_argc = fw_arg0; | 48 | prom_argc = fw_arg0; |
50 | prom_argv = (char **) fw_arg1; | 49 | prom_argv = (char **)fw_arg1; |
51 | prom_envp = (char **) fw_arg2; | 50 | prom_envp = (char **)fw_arg2; |
52 | 51 | ||
53 | prom_init_cmdline(); | 52 | prom_init_cmdline(); |
54 | 53 | ||
@@ -56,6 +55,6 @@ void __init prom_init(void) | |||
56 | if (!memsize_str) | 55 | if (!memsize_str) |
57 | memsize = 0x04000000; | 56 | memsize = 0x04000000; |
58 | else | 57 | else |
59 | memsize = simple_strtol(memsize_str, NULL, 0); | 58 | memsize = strict_strtol(memsize_str, 0, NULL); |
60 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 59 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
61 | } | 60 | } |