Merge by Hand

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

diff --git a/mm/Makefile b/mm/Makefile
index 4cd69e3ce4214996108e251b3ac9c505625f3419..2fa6d2ca9f28ec0572eded8cf025e727a622440d 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -18,5 +18,5 @@ obj-$(CONFIG_NUMA)    += mempolicy.o
 obj-$(CONFIG_SPARSEMEM)        += sparse.o
 obj-$(CONFIG_SHMEM) += shmem.o
 obj-$(CONFIG_TINY_SHMEM) += tiny-shmem.o
-
+obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
 obj-$(CONFIG_FS_XIP) += filemap_xip.o