This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 5f3baec..7ca6458 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -8,8 +8,11 @@ mmu-$(CONFIG_MMU)      := fremap.o highmem.o madvise.o memory.o mincore.o \
                           shmem.o vmalloc.o
 
 obj-y                  := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
-                          page_alloc.o page-writeback.o pdflush.o readahead.o \
-                          slab.o swap.o truncate.o vmscan.o $(mmu-y)
+                          page_alloc.o page-writeback.o pdflush.o prio_tree.o \
+                          readahead.o slab.o swap.o truncate.o vmscan.o \
+                          $(mmu-y)
 
 obj-$(CONFIG_SWAP)     += page_io.o swap_state.o swapfile.o
+obj-$(CONFIG_X86_4G)   += usercopy.o
 obj-$(CONFIG_HUGETLBFS)        += hugetlb.o
+obj-$(CONFIG_NUMA)     += mempolicy.o