openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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'
This commit is contained in:
Linus Torvalds 2012-01-08 13:15:27 -08:00
parent eb59c505f8 282e5aaba2
commit b4a133da2e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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"