diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:25:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:25:12 +1100 |
| commit | 98f7deb43813186d9c8350cac8292e9b832d754d (patch) | |
| tree | 5811014e01338968bdf9fd1b3398aedc8ae9ad35 /arch/x86/mm/Makefile | |
| parent | 5b7315d0a143e579edba5039e73d9bdec4ecffdf (diff) | |
| parent | fe9d4201c8fa8e1891ffb63761e5e1925f7a745f (diff) | |
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/mm/Makefile')
| -rw-r--r-- | arch/x86/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 55543397a8a7..09df2f9a3d69 100644 --- a/arch/x86/mm/Makefile +++ b/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_K8_NUMA) += k8topology_64.o +obj-$(CONFIG_AMD_NUMA) += amdtopology_64.o obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o |