summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu/mcheck/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-31 04:14:26 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2010-05-31 04:14:26 (GMT)
commitd5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch)
tree4facc6d96116b032a3c1cb2ced9b2a3008e9216e /arch/x86/kernel/cpu/mcheck/Makefile
parenteb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff)
parent67a3e12b05e055c0415c556a315a3d3eb637e29e (diff)
downloadlinux-fsl-qoriq-d5b732b17ca2fc74f370bdba5aae6c804fac8c35.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/Makefile')
-rw-r--r--arch/x86/kernel/cpu/mcheck/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/Makefile b/arch/x86/kernel/cpu/mcheck/Makefile
index 4ac6d48..bb34b03 100644
--- 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