Commit b4a133da authored by Linus Torvalds's avatar Linus Torvalds

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'
parents eb59c505 282e5aab
...@@ -1742,7 +1742,7 @@ source "drivers/sfi/Kconfig" ...@@ -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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment