From 324150c0e14a764f59f4ea36d6605b6fe187480e Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 19 Jul 2007 01:47:39 -0700
Subject: [PATCH] --- yaml --- r: 61552 b: refs/heads/master c:
 d7372cdf6938ccea23ec9fc68970702fed9ec3c8 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/sleep/poweroff.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d1ed32b8ce8e..538928aa2b89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c961dfb7c903cfd1cd71b506863894038fd704f
+refs/heads/master: d7372cdf6938ccea23ec9fc68970702fed9ec3c8
diff --git a/trunk/drivers/acpi/sleep/poweroff.c b/trunk/drivers/acpi/sleep/poweroff.c
index d9801eff6489..240dde9cf13a 100644
--- a/trunk/drivers/acpi/sleep/poweroff.c
+++ b/trunk/drivers/acpi/sleep/poweroff.c
@@ -54,9 +54,6 @@ static int acpi_shutdown(struct sys_device *x)
 	case SYSTEM_POWER_OFF:
 		/* Prepare to power off the system */
 		return acpi_sleep_prepare(ACPI_STATE_S5);
-	case SYSTEM_SUSPEND_DISK:
-		/* Prepare to suspend the system to disk */
-		return acpi_sleep_prepare(ACPI_STATE_S4);
 	default:
 		return 0;
 	}