linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index d2ca5bb..9aa03fa 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -7,17 +7,18 @@ mmu-$(CONFIG_MMU)     := fremap.o highmem.o madvise.o memory.o mincore.o \
                           mlock.o mmap.o mprotect.o mremap.o msync.o rmap.o \
                           vmalloc.o
 
-obj-y                  := bootmem.o filemap.o mempool.o fadvise.o \
-                          page_alloc.o page-writeback.o pdflush.o prio_tree.o \
-                          readahead.o slab.o swap.o truncate.o vmscan.o \
-                          $(mmu-y)
+obj-y                  := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
+                          page_alloc.o page-writeback.o pdflush.o \
+                          readahead.o swap.o truncate.o vmscan.o \
+                          prio_tree.o util.o $(mmu-y)
 
-obj-$(CONFIG_OOM_KILL) += oom_kill.o
-obj-$(CONFIG_OOM_PANIC)        += oom_panic.o
 obj-$(CONFIG_SWAP)     += page_io.o swap_state.o swapfile.o thrash.o
 obj-$(CONFIG_HUGETLBFS)        += hugetlb.o
-obj-$(CONFIG_PROC_MM)  += proc_mm.o
 obj-$(CONFIG_NUMA)     += mempolicy.o
+obj-$(CONFIG_SPARSEMEM)        += sparse.o
 obj-$(CONFIG_SHMEM) += shmem.o
 obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o
-
+obj-$(CONFIG_SLOB) += slob.o
+obj-$(CONFIG_SLAB) += slab.o
+obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
+obj-$(CONFIG_FS_XIP) += filemap_xip.o