]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
APM support depends on CONFIG_PM_SLEEP
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Jul 2007 10:12:37 +0000 (20:12 +1000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 30 Jul 2007 17:52:10 +0000 (10:52 -0700)
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>
arch/i386/Kconfig

index abb582bc218fdf4207d3fa3ce92d753fffa35f40..5c8a845a412903a5f871e5626ec2851499ccb134 100644 (file)
@@ -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