diff --git a/[refs] b/[refs]
index 319e427dd2f4..4b51d9eb794e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cefa5b9b0a61b62442c5d0ca00a304c5896b6e9
+refs/heads/master: 927604c7592473742891dc13e1da09febc06e01b
diff --git a/trunk/arch/x86/mm/Makefile b/trunk/arch/x86/mm/Makefile
index dfb932dcf136..59f89b434b45 100644
--- a/trunk/arch/x86/mm/Makefile
+++ b/trunk/arch/x86/mm/Makefile
@@ -13,12 +13,8 @@ obj-$(CONFIG_MMIOTRACE)		+= mmiotrace.o
 mmiotrace-y			:= pf_in.o mmio-mod.o
 obj-$(CONFIG_MMIOTRACE_TEST)	+= testmmiotrace.o
 
-ifeq ($(CONFIG_X86_32),y)
-obj-$(CONFIG_NUMA)		+= discontig_32.o
-else
-obj-$(CONFIG_NUMA)		+= numa_64.o
+obj-$(CONFIG_NUMA)		+= numa_$(BITS).o
 obj-$(CONFIG_K8_NUMA)		+= k8topology_64.o
-endif
 obj-$(CONFIG_ACPI_NUMA)		+= srat_$(BITS).o
 
 obj-$(CONFIG_MEMTEST)		+= memtest.o
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/numa_32.c
similarity index 100%
rename from trunk/arch/x86/mm/discontig_32.c
rename to trunk/arch/x86/mm/numa_32.c