update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 0073f3e..366e50d 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -12,8 +12,6 @@ obj-y                 := bootmem.o filemap.o mempool.o oom_kill.o fadvise.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_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_PROC_MM)  += proc_mm.o