x86: unify arch/x86/mm/Makefile

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / Makefile

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 9832910968486f3de246f0f1065021f5de977871..8e81660604bc7f5e15b36ffa347477f2f5708783 100644 (file)
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,5 +1,15 @@
+obj-y  :=  init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o
+
+obj-$(CONFIG_X86_32)           += pgtable_32.o
+
+obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
+
+obj-$(CONFIG_HIGHMEM)          += highmem_32.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
+obj-$(CONFIG_ACPI_NUMA)                += srat_64.o
 endif