diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 07a5385..07891c8 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -3,9 +3,15 @@
 #
 
 obj-y				:= consistent.o extable.o fault-armv.o \
-				   fault.o flush.o init.o ioremap.o mmap.o \
+				   fault.o flush.o init.o iomap.o mmap.o \
 				   mm-armv.o
 
+obj-$(CONFIG_MMU)		+= ioremap.o
+
+ifneq ($(CONFIG_MMU),y)
+obj-y				+= nommu.o
+endif
+
 obj-$(CONFIG_MODULES)		+= proc-syms.o
 
 obj-$(CONFIG_ALIGNMENT_TRAP)	+= alignment.o