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 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
mtx-1
/
init.c
diff --git
a/arch/mips/au1000/mtx-1/init.c
b/arch/mips/au1000/mtx-1/init.c
index
cdeae32
..
33a4aeb
100644
(file)
--- a/
arch/mips/au1000/mtx-1/init.c
+++ b/
arch/mips/au1000/mtx-1/init.c
@@
-3,9
+3,8
@@
* BRIEF MODULE DESCRIPTION
* 4G Systems MTX-1 board setup
*
* BRIEF MODULE DESCRIPTION
* 4G Systems MTX-1 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>
* Bruno Randolf <bruno.randolf@4g-systems.biz>
*
* This program is free software; you can redistribute it and/or modify it
* Bruno Randolf <bruno.randolf@4g-systems.biz>
*
* This program is free software; you can redistribute it and/or modify it
@@
-28,14
+27,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/string.h>
+
#include <linux/kernel.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/init.h>
#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <asm/addrspace.h>
#include <asm/bootinfo.h>
#include <prom.h>
#include <asm/bootinfo.h>
#include <prom.h>
@@
-51,10
+46,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;
-
- mips_machtype = MACH_MTX1; /* set the platform # */
+ prom_argv = (char **)fw_arg1;
+ prom_envp = (char **)fw_arg2;
prom_init_cmdline();
prom_init_cmdline();
@@
-62,6
+55,6
@@
void __init prom_init(void)
if (!memsize_str)
memsize = 0x04000000;
else
if (!memsize_str)
memsize = 0x04000000;
else
- memsize = s
imple_strtol(memsize_str, NULL, 0
);
+ memsize = s
trict_strtol(memsize_str, 0, NULL
);
add_memory_region(0, memsize, BOOT_MEM_RAM);
}
add_memory_region(0, memsize, BOOT_MEM_RAM);
}