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
/
ite-boards
/
generic
/
it8172_setup.c
diff --git
a/arch/mips/ite-boards/generic/it8172_setup.c
b/arch/mips/ite-boards/generic/it8172_setup.c
index
d808a67
..
fc73c8d
100644
(file)
--- a/
arch/mips/ite-boards/generic/it8172_setup.c
+++ b/
arch/mips/ite-boards/generic/it8172_setup.c
@@
-34,6
+34,7
@@
#include <linux/major.h>
#include <linux/kdev_t.h>
#include <linux/root_dev.h>
#include <linux/major.h>
#include <linux/kdev_t.h>
#include <linux/root_dev.h>
+#include <linux/pm.h>
#include <asm/cpu.h>
#include <asm/time.h>
#include <asm/cpu.h>
#include <asm/time.h>
@@
-105,7
+106,7
@@
void __init it8172_init_ram_resource(unsigned long memsize)
it8172_resources.ram.end = memsize;
}
it8172_resources.ram.end = memsize;
}
-
static void __init it8172
_setup(void)
+
void __init plat
_setup(void)
{
unsigned short dsr;
char *argptr;
{
unsigned short dsr;
char *argptr;
@@
-125,11
+126,11
@@
static void __init it8172_setup(void)
_machine_restart = it8172_restart;
_machine_halt = it8172_halt;
_machine_restart = it8172_restart;
_machine_halt = it8172_halt;
-
_machine
_power_off = it8172_power_off;
+
pm
_power_off = it8172_power_off;
/*
* IO/MEM resources.
/*
* IO/MEM resources.
- *
+ *
* revisit this area.
*/
set_io_port_base(KSEG1);
* revisit this area.
*/
set_io_port_base(KSEG1);
@@
-251,8
+252,6
@@
static void __init it8172_setup(void)
#endif /* CONFIG_IT8172_SCR1 */
}
#endif /* CONFIG_IT8172_SCR1 */
}
-early_initcall(it8172_setup);
-
#ifdef CONFIG_SERIO_I8042
/*
* According to the ITE Special BIOS Note for waking up the
#ifdef CONFIG_SERIO_I8042
/*
* According to the ITE Special BIOS Note for waking up the