From cd1ef6e37e1cb636f82ecd88f8abafb1900e0f60 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 4 Aug 2005 11:36:26 +0200
Subject: [PATCH] --- yaml --- r: 5612 b: refs/heads/master c:
 c36f19e02a96488f550fdb678c92500afca3109b h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ce7e20993bc8..93781ad1133f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329
+refs/heads/master: c36f19e02a96488f550fdb678c92500afca3109b
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 000e81ad2c1d..0bcaed6560ac 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -404,7 +404,6 @@ void kernel_halt(void)
 {
 	notifier_call_chain(&reboot_notifier_list, SYS_HALT, NULL);
 	system_state = SYSTEM_HALT;
-	device_suspend(PMSG_SUSPEND);
 	device_shutdown();
 	printk(KERN_EMERG "System halted.\n");
 	machine_halt();
@@ -415,7 +414,6 @@ void kernel_power_off(void)
 {
 	notifier_call_chain(&reboot_notifier_list, SYS_POWER_OFF, NULL);
 	system_state = SYSTEM_POWER_OFF;
-	device_suspend(PMSG_SUSPEND);
 	device_shutdown();
 	printk(KERN_EMERG "Power down.\n");
 	machine_power_off();