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
/
lasat
/
reset.c
diff --git
a/arch/mips/lasat/reset.c
b/arch/mips/lasat/reset.c
index
37e4912
..
181bf68
100644
(file)
--- a/
arch/mips/lasat/reset.c
+++ b/
arch/mips/lasat/reset.c
@@
-1,4
+1,4
@@
-/*
+/*
* Thomas Horsten <thh@lasat.com>
* Copyright (C) 2000 LASAT Networks A/S.
*
* Thomas Horsten <thh@lasat.com>
* Copyright (C) 2000 LASAT Networks A/S.
*
@@
-19,9
+19,12
@@
*/
#include <linux/config.h>
#include <linux/kernel.h>
*/
#include <linux/config.h>
#include <linux/kernel.h>
+#include <linux/pm.h>
+
#include <asm/reboot.h>
#include <asm/system.h>
#include <asm/lasat/lasat.h>
#include <asm/reboot.h>
#include <asm/system.h>
#include <asm/lasat/lasat.h>
+
#include "picvue.h"
#include "prom.h"
#include "picvue.h"
#include "prom.h"
@@
-63,5
+66,5
@@
void lasat_reboot_setup(void)
{
_machine_restart = lasat_machine_restart;
_machine_halt = lasat_machine_halt;
{
_machine_restart = lasat_machine_restart;
_machine_halt = lasat_machine_halt;
-
_machine
_power_off = lasat_machine_halt;
+
pm
_power_off = lasat_machine_halt;
}
}