diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-12 17:54:48 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-12 17:54:48 -0400 |
| commit | bf2ba3bc185269eca274b458aac46ba1ad7c1121 (patch) | |
| tree | 2cdaf7568df3ab762f42e7849fc9211dcb60d1bc /mm/Makefile | |
| parent | bcceeeba9b3ca99c29523bb7af16727f8a837db4 (diff) | |
| parent | f5e1dd34561e0fb06400b378d595198918833021 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Makefile b/mm/Makefile index f00803386a67..305d10acd081 100644 --- a/mm/Makefile +++ b/mm/Makefile | |||
| @@ -17,7 +17,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ | |||
| 17 | util.o mmzone.o vmstat.o backing-dev.o \ | 17 | util.o mmzone.o vmstat.o backing-dev.o \ |
| 18 | mm_init.o mmu_context.o percpu.o slab_common.o \ | 18 | mm_init.o mmu_context.o percpu.o slab_common.o \ |
| 19 | compaction.o balloon_compaction.o \ | 19 | compaction.o balloon_compaction.o \ |
| 20 | interval_tree.o $(mmu-y) | 20 | interval_tree.o list_lru.o $(mmu-y) |
| 21 | 21 | ||
| 22 | obj-y += init-mm.o | 22 | obj-y += init-mm.o |
| 23 | 23 | ||