aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <[email protected]>2007-07-30 10:12:37 +0000
committerLinus Torvalds <[email protected]>2007-07-30 17:52:10 +0000
commit63332a9d16e7dede26d252af3f9c4304b51e7974 (patch)
treef9a5ab2c2fd40f52a1e70fa71aadb5702b306d73
parentm32r: build fix for removing fs.h from mm.h (diff)
downloadkernel-63332a9d16e7dede26d252af3f9c4304b51e7974.tar.gz
kernel-63332a9d16e7dede26d252af3f9c4304b51e7974.zip
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 <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]> [ Simplified a bit as suggested by Rafael. -Linus ] Signed-off-by: Linus Torvalds <[email protected]>
-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"
menuconfig APM
tristate "APM (Advanced Power Management) BIOS support"
- depends on PM && !X86_VISWS
+ depends on PM_SLEEP && !X86_VISWS
---help---
APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with