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'

arch/x86/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1742,7 +1742,7 @@ source "drivers/sfi/Kconfig"

	config X86_APM_BOOT		config X86_APM_BOOT
	def_bool y		def_bool y
	depends on APM \|\| APM_MODULE		depends on APM

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