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