diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-15 11:31:41 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-15 11:31:41 +0000 |
commit | eceab4ac8d9dd8955e0961fd7477664c087a9017 (patch) | |
tree | 47614fc4f8312687d29fc31e4c31088f61e2a9f3 /arch/arm | |
parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
download | talos-obmc-linux-eceab4ac8d9dd8955e0961fd7477664c087a9017.tar.gz talos-obmc-linux-eceab4ac8d9dd8955e0961fd7477664c087a9017.zip |
[ARM] Use kernel/power/Kconfig
Rather than defining our own PM option, use kernel/power/Kconfig.
This fixes build errors introduced by
bca73e4bf8563d83f7856164caa44d5f42e44cca
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 70b007e66926..4b15f5f1e254 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -652,25 +652,11 @@ endmenu menu "Power management options" -config PM - bool "Power Management support" - ---help--- - "Power Management" means that parts of your computer are shut - off or put into a power conserving "sleep" mode if they are not - being used. There are two competing standards for doing this: APM - and ACPI. If you want to use either one, say Y here and then also - to the requisite support below. - - Power Management is most important for battery powered laptop - computers; if you have a laptop, check out the Linux Laptop home - page on the WWW at <http://www.linux-on-laptops.com/> or - Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/> - and the Battery Powered Linux mini-HOWTO, available from - <http://www.tldp.org/docs.html#howto>. +source "kernel/power/Kconfig" config APM tristate "Advanced Power Management Emulation" - depends on PM + depends on PM_LEGACY ---help--- APM is a BIOS specification for saving power using several different techniques. This is mostly useful for battery powered laptops with |