aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mm/Makefile8
-rw-r--r--include/asm-arm/mach/map.h4
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index ddce0387898..21a2770226e 100644
--- a/arch/arm/mm/Makefile
+++ b/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/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h
index c3929fc74af..cef5364ed5f 100644
--- a/include/asm-arm/mach/map.h
+++ b/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