diff --git a/[refs] b/[refs] index 6e39c055b907..de7c7c7006fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 752d4f372f90a2f6eb562aaffb639957890cbcab +refs/heads/master: c6f58878204b0414e00b43f9bcebf754284f95b4 diff --git a/trunk/arch/x86/mm/Makefile b/trunk/arch/x86/mm/Makefile index 62997be33072..3d11327c9ab4 100644 --- a/trunk/arch/x86/mm/Makefile +++ b/trunk/arch/x86/mm/Makefile @@ -23,7 +23,7 @@ mmiotrace-y := kmmio.o pf_in.o mmio-mod.o obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o obj-$(CONFIG_NUMA) += numa.o numa_$(BITS).o -obj-$(CONFIG_AMD_NUMA) += amdtopology_64.o +obj-$(CONFIG_AMD_NUMA) += amdtopology.o obj-$(CONFIG_ACPI_NUMA) += srat.o obj-$(CONFIG_NUMA_EMU) += numa_emulation.o diff --git a/trunk/arch/x86/mm/amdtopology_64.c b/trunk/arch/x86/mm/amdtopology.c similarity index 100% rename from trunk/arch/x86/mm/amdtopology_64.c rename to trunk/arch/x86/mm/amdtopology.c