git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
Makefile
diff --git
a/arch/x86/kernel/cpu/mcheck/Makefile
b/arch/x86/kernel/cpu/mcheck/Makefile
index
4ac6d48
..
bb34b03
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/Makefile
+++ b/
arch/x86/kernel/cpu/mcheck/Makefile
@@
-7,3
+7,5
@@
obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
obj-$(CONFIG_X86_MCE_INJECT) += mce-inject.o
obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
+
+obj-$(CONFIG_ACPI_APEI) += mce-apei.o