diff --git a/[refs] b/[refs]
index f89c6835fda2..1fe60b0248a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eefd34fdcbd34e2cddb8b7da26d838367591954
+refs/heads/master: f89bce3d9afc6b1fb898ae176df4962c1303ee86
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index 710ed084e7c5..ed296225dcd4 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -20,13 +20,14 @@ config PM
 	  sending the processor to sleep and saving power.
 
 config PM_LEGACY
-	bool "Legacy Power Management API"
+	bool "Legacy Power Management API (DEPRECATED)"
 	depends on PM
-	default y
+	default n
 	---help---
-	   Support for pm_register() and friends.
+	   Support for pm_register() and friends.  This old API is obsoleted
+	   by the driver model.
 
-	   If unsure, say Y.
+	   If unsure, say N.
 
 config PM_DEBUG
 	bool "Power Management Debug Support"