diff --git a/[refs] b/[refs]
index cb8b29e1e4a9..823d69cedf36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 888e7bf166a0059480da137f3bd28dcd51175f3d
+refs/heads/master: 092c1952e18fec06f3a951113fe1d87492d6e840
diff --git a/trunk/arch/arm/mm/Makefile b/trunk/arch/arm/mm/Makefile
index ddce03878981..21a2770226ee 100644
--- a/trunk/arch/arm/mm/Makefile
+++ b/trunk/arch/arm/mm/Makefile
@@ -2,11 +2,11 @@
 # Makefile for the linux arm-specific parts of the memory manager.
 #
 
-obj-y				:= consistent.o extable.o fault-armv.o \
-				   fault.o init.o iomap.o mmap.o \
-				   mm-armv.o
+obj-y				:= consistent.o extable.o fault.o init.o \
+				   iomap.o
 
-obj-$(CONFIG_MMU)		+= flush.o ioremap.o
+obj-$(CONFIG_MMU)		+= fault-armv.o flush.o ioremap.o mmap.o \
+				   mm-armv.o
 
 ifneq ($(CONFIG_MMU),y)
 obj-y				+= nommu.o
diff --git a/trunk/include/asm-arm/mach/map.h b/trunk/include/asm-arm/mach/map.h
index c3929fc74afd..cef5364ed5fe 100644
--- a/trunk/include/asm-arm/mach/map.h
+++ b/trunk/include/asm-arm/mach/map.h
@@ -26,4 +26,8 @@ struct map_desc {
 #define MT_IXP2000_DEVICE	7
 #define MT_NONSHARED_DEVICE	8
 
+#ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
+#else
+#define iotable_init(map,num)	do { } while (0)
+#endif