projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
eb59c50
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 8 Jan 2012 21:15:27 +0000
(13:15 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 8 Jan 2012 21:15:27 +0000
(13:15 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
x86: Kconfig: drop unknown symbol 'APM_MODULE'
arch/x86/Kconfig
patch
|
blob
|
history
diff --git
a/arch/x86/Kconfig
b/arch/x86/Kconfig
index 5731eb70e0a0642d422ad8653cd7725b762757d0..1d2a69dd36d89c32e16cbe19d6062d5da95f4d52 100644
(file)
--- a/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@
-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"