From f2696f828cc81c07c3a9ea0dd2c9c1ca7d4f6bbe Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 5 Dec 2006 03:07:38 -0800
Subject: [PATCH] --- yaml --- r: 44567 b: refs/heads/master c:
 f89bce3d9afc6b1fb898ae176df4962c1303ee86 h: refs/heads/master i:   44565:
 7ca6bc0fcd8d021e324e93fa6dae67ebd8608f52   44563:
 a5b11c0b0eb7766a32c69ee9045e939968158edc   44559:
 aba2bd25ffacf95d78f023eeddbade46ba3b782b v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/power/Kconfig | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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"