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

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'

Linus Torvalds 13 years ago

parent

eb59c505f8 282e5aaba2

commit

b4a133da2e

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
arch/x86/Kconfig
							 
								View File
							
				@@ -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"