diff --git a/[refs] b/[refs]
index d8b8bc4b3141..5c7d33135866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4c94330e3395ae87451bded2840a25d04f27902
+refs/heads/master: 88d10bbaaec38856f913313b6c0858d9e9b7a066
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 2d8bf054d036..761956e813f5 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -17,12 +17,12 @@
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
+#include <linux/pm.h>
 
 #include "power.h"
 
 
 extern suspend_disk_method_t pm_disk_mode;
-extern struct pm_ops * pm_ops;
 
 extern int swsusp_suspend(void);
 extern int swsusp_write(void);
@@ -49,13 +49,11 @@ dev_t swsusp_resume_device;
 
 static void power_down(suspend_disk_method_t mode)
 {
-	unsigned long flags;
 	int error = 0;
 
-	local_irq_save(flags);
 	switch(mode) {
 	case PM_DISK_PLATFORM:
- 		device_shutdown();
+		kernel_power_off_prepare();
 		error = pm_ops->enter(PM_SUSPEND_DISK);
 		break;
 	case PM_DISK_SHUTDOWN: