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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
x86: Kconfig: drop unknown symbol 'APM_MODULE'

Linus Torvalds 14 years ago b4a133da eb59c505

+1 -1

1 changed file

expand all

arch

x86

Kconfig

+1 -1

arch/x86/Kconfig

··· 1742 1742 1743 1743 config X86_APM_BOOT 1744 1744 def_bool y 1745 - depends on APM || APM_MODULE 1745 + depends on APM 1746 1746 1747 1747 menuconfig APM 1748 1748 tristate "APM (Advanced Power Management) BIOS support"