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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
38a78ab
..
fed4e8e
100644
(file)
--- a/
arch/mips/momentum/ocelot_g/setup.c
+++ b/
arch/mips/momentum/ocelot_g/setup.c
@@
-47,8
+47,10
@@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
+#include <linux/pm.h>
#include <linux/timex.h>
#include <linux/vmalloc.h>
#include <linux/timex.h>
#include <linux/vmalloc.h>
+
#include <asm/time.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
#include <asm/time.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
@@
-160,7
+162,7
@@
static void __init setup_l3cache(unsigned long size)
printk("Done\n");
}
printk("Done\n");
}
-
static int __init momenco_ocelot_g
_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;
@@
-169,7
+171,7
@@
static int __init momenco_ocelot_g_setup(void)
_machine_restart = momenco_ocelot_restart;
_machine_halt = momenco_ocelot_halt;
_machine_restart = momenco_ocelot_restart;
_machine_halt = momenco_ocelot_halt;
-
_machine
_power_off = momenco_ocelot_power_off;
+
pm
_power_off = momenco_ocelot_power_off;
/*
* initrd_start = (ulong)ocelot_initrd_start;
/*
* initrd_start = (ulong)ocelot_initrd_start;
@@
-240,12
+242,8
@@
static int __init momenco_ocelot_g_setup(void)
/* FIXME: Fix up the DiskOnChip mapping */
MV_WRITE(0x468, 0xfef73);
/* FIXME: Fix up the DiskOnChip mapping */
MV_WRITE(0x468, 0xfef73);
-
- return 0;
}
}
-early_initcall(momenco_ocelot_g_setup);
-
/* This needs to be one of the first initcalls, because no I/O port access
can work before this */
/* This needs to be one of the first initcalls, because no I/O port access
can work before this */