diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 23:16:27 +0300 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 23:16:27 +0300 |
commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
tree | 63429c2222a55509dc81269233bbe7a321bb86ed /arch/mips/lasat/reset.c | |
parent | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (diff) | |
parent | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (diff) | |
download | linux-5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859.tar.xz |
Merge branch 'master'
Diffstat (limited to 'arch/mips/lasat/reset.c')
-rw-r--r-- | arch/mips/lasat/reset.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c index 8d7d7a454f9a..181bf68175fc 100644 --- a/arch/mips/lasat/reset.c +++ b/arch/mips/lasat/reset.c @@ -19,9 +19,12 @@ */ #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 "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_power_off = lasat_machine_halt; + pm_power_off = lasat_machine_halt; } |