diff --git a/[refs] b/[refs]
index 65d92c697f93..3c5a52f691a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b4ae1f1d2ae595ff2fc5597287881796e0e6bfc
+refs/heads/master: 0ddbccd1187e12bf77e1f19d8b9dec700e09e734
diff --git a/trunk/arch/arm/mm/Makefile b/trunk/arch/arm/mm/Makefile
index 2e27a8c8372b..480f78a3611a 100644
--- a/trunk/arch/arm/mm/Makefile
+++ b/trunk/arch/arm/mm/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux arm-specific parts of the memory manager.
 #
 
-obj-y				:= consistent.o extable.o fault.o init.o \
+obj-y				:= dma-mapping.o extable.o fault.o init.o \
 				   iomap.o
 
 obj-$(CONFIG_MMU)		+= fault-armv.o flush.o ioremap.o mmap.o \
diff --git a/trunk/arch/arm/mm/consistent.c b/trunk/arch/arm/mm/dma-mapping.c
similarity index 99%
rename from trunk/arch/arm/mm/consistent.c
rename to trunk/arch/arm/mm/dma-mapping.c
index db7b3e38ef1d..9f312248d5af 100644
--- a/trunk/arch/arm/mm/consistent.c
+++ b/trunk/arch/arm/mm/dma-mapping.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/mm/consistent.c
+ *  linux/arch/arm/mm/dma-mapping.c
  *
  *  Copyright (C) 2000-2004 Russell King
  *