aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-08 16:15:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-08 16:15:27 -0500
commitb4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (patch)
treef0f61cdfe25f0cf269c7dcd4bf9172250c20f7a7
parenteb59c505f8a5906ad2e053d14fab50eb8574fd6f (diff)
parent282e5aaba2a0cdfde4d2c2e34bc7438cd6f7a00f (diff)
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'
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5731eb70e0a0..1d2a69dd36d8 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1742,7 +1742,7 @@ source "drivers/sfi/Kconfig"
1742 1742
1743config X86_APM_BOOT 1743config X86_APM_BOOT
1744 def_bool y 1744 def_bool y
1745 depends on APM || APM_MODULE 1745 depends on APM
1746 1746
1747menuconfig APM 1747menuconfig APM
1748 tristate "APM (Advanced Power Management) BIOS support" 1748 tristate "APM (Advanced Power Management) BIOS support"