Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 79833170bb9cddf4aad9b6bde7806628856ffde5..b45da40e8d25f6a480fb8366004fcd4de2607ef4 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -19,16 +19,6 @@ config PM
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 

-config PM_LEGACY
-       bool "Legacy Power Management API (DEPRECATED)"
-       depends on PM
-       default n
-       ---help---
-          Support for pm_register() and friends.  This old API is obsoleted
-          by the driver model.
-
-          If unsure, say N.
-

 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM


@@ -190,7 +180,7 @@ config APM_EMULATION
          notification of APM "events" (e.g. battery status change).
 
          In order to use APM, you will need supporting software. For location
          notification of APM "events" (e.g. battery status change).
 
          In order to use APM, you will need supporting software. For location

-         and more information, read <file:Documentation/pm.txt> and the
+         and more information, read <file:Documentation/power/pm.txt> and the

          Battery Powered Linux mini-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.
 
          Battery Powered Linux mini-HOWTO, available from
          <http://www.tldp.org/docs.html#howto>.