diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-15 17:52:21 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-15 17:52:21 +1000 |
| commit | c3139c0af3d28c219c11dc216d1e7b4d4724a095 (patch) | |
| tree | b93bc3d0e0e1713bc9babe643a7aa5fbb0fb2363 /mm/Makefile | |
| parent | 3d7295b32267d682d2060e7afd3036dee6c3ae13 (diff) | |
| parent | 7407621ec9e00da2298c4b5fff4c73de44f99e40 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'mm/Makefile')
| -rw-r--r-- | mm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/Makefile b/mm/Makefile index 4064f3ec145e..cb23cd277229 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -60,5 +60,7 @@ obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o obj-$(CONFIG_CLEANCACHE) += cleancache.o obj-$(CONFIG_MEMORY_ISOLATION) += page_isolation.o obj-$(CONFIG_ZBUD) += zbud.o +obj-$(CONFIG_ZPOOL) += zpool.o obj-$(CONFIG_ZSMALLOC) += zsmalloc.o obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o +obj-$(CONFIG_CMA) += cma.o |