aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/Kconfig
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-07-30 06:12:37 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 13:52:10 -0400
commit63332a9d16e7dede26d252af3f9c4304b51e7974 (patch)
treef9a5ab2c2fd40f52a1e70fa71aadb5702b306d73 /arch/i386/Kconfig
parentcfcd8c4fbc4c84c286d3ebae8648914016c1ea4c (diff)
APM support depends on CONFIG_PM_SLEEP
Commit 296699de6bdc717189a331ab6bbe90e05c94db06 broke building APM support if CONFIG_PM_SLEEP is not set. Reported by Toralf Förster <toralf.foerster@gmx.de> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> [ Simplified a bit as suggested by Rafael. -Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/Kconfig')
-rw-r--r--arch/i386/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index abb582bc218f..5c8a845a4129 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -938,7 +938,7 @@ source "drivers/acpi/Kconfig"
938 938
939menuconfig APM 939menuconfig APM
940 tristate "APM (Advanced Power Management) BIOS support" 940 tristate "APM (Advanced Power Management) BIOS support"
941 depends on PM && !X86_VISWS 941 depends on PM_SLEEP && !X86_VISWS
942 ---help--- 942 ---help---
943 APM is a BIOS specification for saving power using several different 943 APM is a BIOS specification for saving power using several different
944 techniques. This is mostly useful for battery powered laptops with 944 techniques. This is mostly useful for battery powered laptops with