upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 01cd3de..c8d96bf 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -7,13 +7,11 @@ 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 \
+obj-y                  := bootmem.o filemap.o oom_kill.o mempool.o fadvise.o \
+                          page_alloc.o page-writeback.o pdflush.o \
                           readahead.o slab.o swap.o truncate.o vmscan.o \
-                          $(mmu-y)
+                          prio_tree.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_NUMA)     += mempolicy.o