Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6] / arch / x86 / mm / Makefile

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 9832910968486f3de246f0f1065021f5de977871..9873716e9f764bcd7c5bc0f369a0269efdffb35a 100644 (file)
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,5 +1,23 @@
+obj-y  :=  init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
+           pat.o pgtable.o
+
+obj-$(CONFIG_X86_32)           += pgtable_32.o
+
+obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
+obj-$(CONFIG_X86_PTDUMP)       += dump_pagetables.o
+
+obj-$(CONFIG_HIGHMEM)          += highmem_32.o
+
+obj-$(CONFIG_MMIOTRACE_HOOKS)  += kmmio.o
+obj-$(CONFIG_MMIOTRACE)                += mmiotrace.o
+mmiotrace-y                    := pf_in.o mmio-mod.o
+obj-$(CONFIG_MMIOTRACE_TEST)   += testmmiotrace.o
+
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/mm/Makefile_32
+obj-$(CONFIG_NUMA)             += discontig_32.o
 else
-include ${srctree}/arch/x86/mm/Makefile_64
+obj-$(CONFIG_NUMA)             += numa_64.o
+obj-$(CONFIG_K8_NUMA)          += k8topology_64.o
 endif
+obj-$(CONFIG_ACPI_NUMA)                += srat_$(BITS).o
+