git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_g
/
setup.c
diff --git
a/arch/mips/momentum/ocelot_g/setup.c
b/arch/mips/momentum/ocelot_g/setup.c
index
c580b1d
..
fed4e8e
100644
(file)
--- a/
arch/mips/momentum/ocelot_g/setup.c
+++ b/
arch/mips/momentum/ocelot_g/setup.c
@@
-37,6
+37,7
@@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-161,7
+162,7
@@
static void __init setup_l3cache(unsigned long size)
printk("Done\n");
}
printk("Done\n");
}
-void __init plat_
mem_
setup(void)
+void __init plat_setup(void)
{
void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);
unsigned int tmpword;
{
void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);
unsigned int tmpword;
@@
-173,8
+174,8
@@
void __init plat_mem_setup(void)
pm_power_off = momenco_ocelot_power_off;
/*
pm_power_off = momenco_ocelot_power_off;
/*
- * initrd_start = (u
nsigned
long)ocelot_initrd_start;
- * initrd_end = (u
nsigned
long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
+ * initrd_start = (ulong)ocelot_initrd_start;
+ * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;
* initrd_below_start_ok = 1;
*/
* initrd_below_start_ok = 1;
*/