Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: x86: Kconfig: drop unknown symbol 'APM_MODULE'
2012-01-08 13:15:27 -08:00 · 2012-01-08 13:15:27 -08:00 · b4a133da2e
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@ -1742,7 +1742,7 @@ source "drivers/sfi/Kconfig"

 config X86_APM_BOOT
 	def_bool y
-	depends on APM || APM_MODULE
+	depends on APM

 menuconfig APM
 	tristate "APM (Advanced Power Management) BIOS support"