diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:02:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:02:58 +1100 |
| commit | d7eaf400f583154283e26244ee671585cd413156 (patch) | |
| tree | 6ac8efcd27bf4d9e8aef4862eeb0b45fca4a5187 /mm/Makefile | |
| parent | 79b1d1f5860545973461d0dcb1f0e8d9c32dbdbe (diff) | |
| parent | f684c699592229c3aebf656363bcb0cf86df2570 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
fs/fs-writeback.c
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/Makefile b/mm/Makefile index 310c90a09264..23a6f7e23019 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -16,8 +16,8 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ readahead.o swap.o truncate.o vmscan.o shmem.o \ util.o mmzone.o vmstat.o backing-dev.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ - compaction.o balloon_compaction.o \ - interval_tree.o list_lru.o $(mmu-y) + compaction.o balloon_compaction.o vmacache.o \ + interval_tree.o list_lru.o workingset.o $(mmu-y) obj-y += init-mm.o |