Merge branch 'upstream' into topic/asoc

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

diff --git a/arch/ia64/mm/Makefile b/arch/ia64/mm/Makefile
index 7078f67887ecc3d1e36b93e066fb87c705f2ca89..bb0a01a8187895fd6e072c2191cb4415dc24e2ca 100644 (file)
--- a/arch/ia64/mm/Makefile
+++ b/arch/ia64/mm/Makefile
@@ -2,11 +2,10 @@
 # Makefile for the ia64-specific parts of the memory manager.
 #
 
-obj-y := init.o fault.o tlb.o extable.o
+obj-y := init.o fault.o tlb.o extable.o ioremap.o
 
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA)        += numa.o
 obj-$(CONFIG_DISCONTIGMEM) += discontig.o
-ifndef CONFIG_DISCONTIGMEM
-obj-y += contig.o
-endif
+obj-$(CONFIG_SPARSEMEM)           += discontig.o
+obj-$(CONFIG_FLATMEM)     += contig.o