aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-15 06:31:41 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-15 06:31:41 -0500
commiteceab4ac8d9dd8955e0961fd7477664c087a9017 (patch)
tree47614fc4f8312687d29fc31e4c31088f61e2a9f3 /arch
parent4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff)
[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')
-rw-r--r--arch/arm/Kconfig18
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
652 652
653menu "Power management options" 653menu "Power management options"
654 654
655config PM 655source "kernel/power/Kconfig"
656 bool "Power Management support"
657 ---help---
658 "Power Management" means that parts of your computer are shut
659 off or put into a power conserving "sleep" mode if they are not
660 being used. There are two competing standards for doing this: APM
661 and ACPI. If you want to use either one, say Y here and then also
662 to the requisite support below.
663
664 Power Management is most important for battery powered laptop
665 computers; if you have a laptop, check out the Linux Laptop home
666 page on the WWW at <http://www.linux-on-laptops.com/> or
667 Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>
668 and the Battery Powered Linux mini-HOWTO, available from
669 <http://www.tldp.org/docs.html#howto>.
670 656
671config APM 657config APM
672 tristate "Advanced Power Management Emulation" 658 tristate "Advanced Power Management Emulation"
673 depends on PM 659 depends on PM_LEGACY
674 ---help--- 660 ---help---
675 APM is a BIOS specification for saving power using several different 661 APM is a BIOS specification for saving power using several different
676 techniques. This is mostly useful for battery powered laptops with 662 techniques. This is mostly useful for battery powered laptops with