2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 2e27a8c8372b..480f78a3611a 100644
--- a/arch/arm/mm/Makefile
+++ b/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/arch/arm/mm/consistent.c b/arch/arm/mm/dma-mapping.c
index db7b3e38ef1d..9f312248d5af 100644
--- a/arch/arm/mm/consistent.c
+++ b/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
 *

diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 2e27a8c8372b..480f78a3611a 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile
@@ -2,7 +2,7 @@
2	# Makefile for the linux arm-specific parts of the memory manager.	2	# Makefile for the linux arm-specific parts of the memory manager.
3	#	3	#
4		4
5	obj-y := consistent.o extable.o fault.o init.o \	5	obj-y := dma-mapping.o extable.o fault.o init.o \
6	iomap.o	6	iomap.o
7		7
8	obj-$(CONFIG_MMU) += fault-armv.o flush.o ioremap.o mmap.o \	8	obj-$(CONFIG_MMU) += fault-armv.o flush.o ioremap.o mmap.o \


diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/dma-mapping.c index db7b3e38ef1d..9f312248d5af 100644 --- a/arch/arm/mm/consistent.c +++ b/arch/arm/mm/dma-mapping.c
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* linux/arch/arm/mm/consistent.c	2	* linux/arch/arm/mm/dma-mapping.c
3	*	3	*
4	* Copyright (C) 2000-2004 Russell King	4	* Copyright (C) 2000-2004 Russell King
5	*	5	*