diff --git a/[refs] b/[refs]
index 3e2e7d018854..c147f17faa8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f09b00fce5ba7bc00425f91860e81571472fbe8
+refs/heads/master: aeb369d26ecfdde242f29d16c41bed562410e392
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 65ce290d7387..a1dcc9d5a900 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
-obj-$(CONFIG_MCA)		+= mca.o
+obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
diff --git a/trunk/arch/i386/kernel/mca.c b/trunk/arch/i386/kernel/mca_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/mca.c
rename to trunk/arch/i386/kernel/mca_32.c