X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2FMakefile;h=776b00dbf31c5b4ddc23a2929b8f1e865c406136;hb=043471a130a8787b4b470bb4400b780bf615b019;hp=60fbbce51b3687f11997521f9f76109d98494cb3;hpb=7b0355718bd197a6ed4f1ed8d9d3ef6c95d3ea71;p=linux-2.6.git

diff --git a/mm/Makefile b/mm/Makefile
index 60fbbce51..776b00dbf 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -7,14 +7,12 @@ 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 \
 			   shmem.o vmalloc.o
 
-obj-y			:= bootmem.o filemap.o mempool.o fadvise.o \
+obj-y			:= bootmem.o filemap.o mempool.o oom_kill.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-$(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_SWAP)	+= page_io.o swap_state.o swapfile.o
 obj-$(CONFIG_X86_4G)	+= usercopy.o
 obj-$(CONFIG_HUGETLBFS)	+= hugetlb.o
 obj-$(CONFIG_PROC_MM)	+= proc_mm.o