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'

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'
b4a133da · Linus Torvalds · eb59c505 · 282e5aab · b4a133da
Commit b4a133da authored Jan 08, 2012 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/x86/Kconfig arch/x86/Kconfig +1 -1

No files found.
--- 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"