projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[firefly-linux-kernel-4.4.55.git]
/
mm
/
Makefile
diff --git
a/mm/Makefile
b/mm/Makefile
index 8982504bd03bb783ab8fe2d0dce2c08010f3e66d..34b2546a9e37e9b2f08891cb7a3242b2fe89c86a 100644
(file)
--- a/
mm/Makefile
+++ b/
mm/Makefile
@@
-15,6
+15,8
@@
obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \
$(mmu-y)
obj-y += init-mm.o
+obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
+
obj-$(CONFIG_BOUNCE) += bounce.o
obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o
obj-$(CONFIG_HAS_DMA) += dmapool.o