From: Stephen Rothwell Date: Mon, 30 Jul 2007 10:12:37 +0000 (+1000) Subject: APM support depends on CONFIG_PM_SLEEP X-Git-Tag: v2.6.23-rc2~156 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=63332a9d16e7dede26d252af3f9c4304b51e7974;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Stephen Rothwell [ Simplified a bit as suggested by Rafael. -Linus ] Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index abb582bc218..5c8a845a412 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