commit 63332a9d16e7dede26d252af3f9c4304b51e7974
author Stephen Rothwell <sfr@canb.auug.org.au> Mon Jul 30 20:12:37 2007 +1000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Jul 30 10:52:10 2007 -0700
tree f9a5ab2c2fd40f52a1e70fa71aadb5702b306d73
parent cfcd8c4fbc4c84c286d3ebae8648914016c1ea4c

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>

arch/i386/Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index abb582b..5c8a845 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -938,7 +938,7 @@
 
 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