diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:14:15 -0400 |
| commit | a670fcb43f01a67ef56176afc76e5d43d128b25c (patch) | |
| tree | 09c9411c78a33ff980e9ea871bc7686e7589abbf /kernel/power/poweroff.c | |
| parent | Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff) | |
| parent | [PATCH] agp: restore APBASE after setting APSIZE (diff) | |
| download | linux-dev-a670fcb43f01a67ef56176afc76e5d43d128b25c.tar.xz linux-dev-a670fcb43f01a67ef56176afc76e5d43d128b25c.zip | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'kernel/power/poweroff.c')
| -rw-r--r-- | kernel/power/poweroff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c index 715081b2d829..7a4144ba3afd 100644 --- a/kernel/power/poweroff.c +++ b/kernel/power/poweroff.c @@ -9,6 +9,7 @@ #include <linux/init.h> #include <linux/pm.h> #include <linux/workqueue.h> +#include <linux/reboot.h> /* * When the user hits Sys-Rq o to power down the machine this is the @@ -17,8 +18,7 @@ static void do_poweroff(void *dummy) { - if (pm_power_off) - pm_power_off(); + kernel_power_off(); } static DECLARE_WORK(poweroff_work, do_poweroff, NULL); |