From 40af1d2ab6c7d54cb9d9bb086da0809bc9ead914 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 21 Jul 2012 20:24:52 +0200
Subject: [PATCH] --- yaml --- r: 312151 b: refs/heads/master c:
 bff9d1865640dcb4d9711dcc50714e9a8b859453 h: refs/heads/master i:   312149:
 446cb77b8bcd76943a1394c2beffb7e103ad8fab   312147:
 e200624bcde84602d8637820c0437720c5cebefe   312143:
 f3929817eda858c9913db2e8a98adc3b6f65718d v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d60ab53a395..d5844ba3b8b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a2bc8603eca4ea4a3a01163593084c5c1b3e16a
+refs/heads/master: bff9d1865640dcb4d9711dcc50714e9a8b859453
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index e07f5e0c5df4..604382143bcf 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -377,7 +377,6 @@ extern enum system_states {
 	SYSTEM_HALT,
 	SYSTEM_POWER_OFF,
 	SYSTEM_RESTART,
-	SYSTEM_SUSPEND_DISK,
 } system_state;
 
 #define TAINT_PROPRIETARY_MODULE	0