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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
xxs1500
/
init.c
diff --git
a/arch/mips/au1000/xxs1500/init.c
b/arch/mips/au1000/xxs1500/init.c
index
7e6878c
..
7516434
100644
(file)
--- a/
arch/mips/au1000/xxs1500/init.c
+++ b/
arch/mips/au1000/xxs1500/init.c
@@
-2,9
+2,8
@@
* BRIEF MODULE DESCRIPTION
* XXS1500 board setup
*
* BRIEF MODULE DESCRIPTION
* XXS1500 board setup
*
- * Copyright 2003 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- * ppopov@mvista.com or source@mvista.com
+ * Copyright 2003, 2008 MontaVista Software Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-26,14
+25,10
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <linux/init.h>
#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/bootmem.h>
-#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
-#include <asm/addrspace.h>
#include <asm/bootinfo.h>
#include <prom.h>
#include <asm/bootinfo.h>
#include <prom.h>
@@
-49,8
+44,8
@@
void __init prom_init(void)
unsigned long memsize;
prom_argc = fw_arg0;
unsigned long memsize;
prom_argc = fw_arg0;
- prom_argv = (char **)
fw_arg1;
- prom_envp = (char **)
fw_arg2;
+ prom_argv = (char **)fw_arg1;
+ prom_envp = (char **)fw_arg2;
prom_init_cmdline();
prom_init_cmdline();
@@
-58,6
+53,6
@@
void __init prom_init(void)
if (!memsize_str)
memsize = 0x04000000;
else
if (!memsize_str)
memsize = 0x04000000;
else
-
memsize = simple_strtol(memsize_str, NULL, 0
);
+
strict_strtol(memsize_str, 0, &memsize
);
add_memory_region(0, memsize, BOOT_MEM_RAM);
}
add_memory_region(0, memsize, BOOT_MEM_RAM);
}