diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 10:05:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 10:05:42 -0700 |
commit | fc67b16ecaf6ebde04096030c268adddade023f1 (patch) | |
tree | 1cce42cdca1fc9e4ec41b9f7f72c60e343cebca7 /arch/ia64/sn/kernel/setup.c | |
parent | e8108c98dd6d65613fa0ec9d2300f89c48d554bf (diff) | |
parent | 2d29306b231a1a0e7a70166c10e4c0f917b21334 (diff) |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index f0306b516af..d35f2a6f9c9 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c @@ -29,6 +29,7 @@ #include <linux/sched.h> #include <linux/root_dev.h> #include <linux/nodemask.h> +#include <linux/pm.h> #include <asm/io.h> #include <asm/sal.h> @@ -353,6 +354,14 @@ void __init sn_setup(char **cmdline_p) screen_info = sn_screen_info; sn_timer_init(); + + /* + * set pm_power_off to a SAL call to allow + * sn machines to power off. The SAL call can be replaced + * by an ACPI interface call when ACPI is fully implemented + * for sn. + */ + pm_power_off = ia64_sn_power_down; } /** |