diff --git a/[refs] b/[refs]
index f45d4f26fb4c..42ab5bbcae69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d07ec74041a48f2ce47aa254e716e1e2c17a1191
+refs/heads/master: 6000e8231e177c43dac15e09a310598031631b5c
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 0d09d8812238..d1375fa831e6 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -32,7 +32,7 @@ obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-y				+= sysenter.o vsyscall.o
-obj-$(CONFIG_ACPI_SRAT) 	+= srat.o
+obj-$(CONFIG_ACPI_SRAT) 	+= srat_32.o
 obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
 obj-$(CONFIG_VM86)		+= vm86.o
diff --git a/trunk/arch/i386/kernel/srat.c b/trunk/arch/i386/kernel/srat_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/srat.c
rename to trunk/arch/i386/kernel/srat_32.c