Merge tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[deliverable/linux.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index be5d5c866305170dffc105b36c7fdcd833bac87c..2ed43191fc3bf78f46f111e88fa9d5a01b8c661a 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -78,4 +78,6 @@ obj-$(CONFIG_CMA)     += cma.o
 obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
 obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
 obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
+obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
+obj-$(CONFIG_IDLE_PAGE_TRACKING) += page_idle.o
 obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o