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
/
gt64120
/
ev64120
/
setup.c
diff --git
a/arch/mips/gt64120/ev64120/setup.c
b/arch/mips/gt64120/ev64120/setup.c
index
dba0961
..
6d859d1
100644
(file)
--- a/
arch/mips/gt64120/ev64120/setup.c
+++ b/
arch/mips/gt64120/ev64120/setup.c
@@
-34,6
+34,8
@@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/timex.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/timex.h>
+#include <linux/pm.h>
+
#include <asm/bootinfo.h>
#include <asm/page.h>
#include <asm/io.h>
#include <asm/bootinfo.h>
#include <asm/page.h>
#include <asm/io.h>
@@
-69,18
+71,16
@@
unsigned long __init prom_free_prom_memory(void)
*/
extern void gt64120_time_init(void);
*/
extern void gt64120_time_init(void);
-
static void __init ev64120
_setup(void)
+
void __init plat
_setup(void)
{
_machine_restart = galileo_machine_restart;
_machine_halt = galileo_machine_halt;
{
_machine_restart = galileo_machine_restart;
_machine_halt = galileo_machine_halt;
-
_machine
_power_off = galileo_machine_power_off;
+
pm
_power_off = galileo_machine_power_off;
board_time_init = gt64120_time_init;
set_io_port_base(KSEG1);
}
board_time_init = gt64120_time_init;
set_io_port_base(KSEG1);
}
-early_initcall(ev64120_setup);
-
const char *get_system_type(void)
{
return "Galileo EV64120A";
const char *get_system_type(void)
{
return "Galileo EV64120A";