Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / include / linux / suspend.h

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 206b735f383f4d4e6a9f3fb08449da9d492713dd..3f529ad9a9d2ec33bf8fcdfa72bb9ddce46a292a 100644 (file)
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -416,7 +416,7 @@ static inline bool hibernation_available(void) { return false; }
 #define PM_RESTORE_PREPARE     0x0005 /* Going to restore a saved image */
 #define PM_POST_RESTORE                0x0006 /* Restore failed */
 
-extern struct mutex pm_mutex;
+extern struct mutex system_transition_mutex;
 
 #ifdef CONFIG_PM_SLEEP
 void save_processor_state(void);