Merge branch 'linus' into tracing/kmemtrace

[linux-2.6-omap-h63xx.git] / mm / Makefile

diff --git a/mm/Makefile b/mm/Makefile
index 3782eb66d4b33a692c9b5396a080fb47c582ea1e..c92e8af132062fca5444e4d497a9989a05c31254 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_SLOB) += slob.o
 obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
 obj-$(CONFIG_SLAB) += slab.o
 obj-$(CONFIG_SLUB) += slub.o
+obj-$(CONFIG_FAILSLAB) += failslab.o
 obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
 obj-$(CONFIG_FS_XIP) += filemap_xip.o
 obj-$(CONFIG_MIGRATION) += migrate.o