---

yaml --- r: 5048 b: refs/heads/master c: ff31977 h: refs/heads/master v: v3
git-mirror · Jul 26, 2005 · 7bef995 · 7bef995
1 parent 2c692d2
commit 7bef995
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62b3a04d75d2dc9480d5ad3b60f4258e548a6a83
+refs/heads/master: ff31977782a05504f2586ec9e3e5ab4b09a4c893
diff --git a/trunk/kernel/power/poweroff.c b/trunk/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);