diff --git a/[refs] b/[refs]
index fcffc97357db..70327e2ef201 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d56734f9e51b21a92a02f526c278c037de65822
+refs/heads/master: 96a6674c5ad6a6f596aab6ac826b93f5cd846749
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index fc8d1319e911..b0a29b510427 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y	:= process.o signal_64.o entry.o traps_64.o irq.o \
 		perfctr-watchdog.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
-obj-$(CONFIG_X86_MCE)		+= mce.o therm_throt.o
+obj-$(CONFIG_X86_MCE)		+= mce_64.o therm_throt.o
 obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel_64.o
 obj-$(CONFIG_X86_MCE_AMD)	+= mce_amd_64.o
 obj-$(CONFIG_MTRR)		+= ../../i386/kernel/cpu/mtrr/
diff --git a/trunk/arch/x86_64/kernel/mce.c b/trunk/arch/x86_64/kernel/mce_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/mce.c
rename to trunk/arch/x86_64/kernel/mce_64.c