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'
mariux64 · Jan 8, 2012 · b4a133d · b4a133d
2 parents eb59c50 + 282e5aa
commit b4a133d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"