projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[powerpc.git]
/
arch
/
mips
/
mm
/
Makefile
diff --git
a/arch/mips/mm/Makefile
b/arch/mips/mm/Makefile
index
19e41fd
..
de57273
100644
(file)
--- a/
arch/mips/mm/Makefile
+++ b/
arch/mips/mm/Makefile
@@
-2,8
+2,8
@@
# Makefile for the Linux/MIPS-specific parts of the memory manager.
#
# Makefile for the Linux/MIPS-specific parts of the memory manager.
#
-obj-y += cache.o
extable.o fault.o init.o pgtable
.o \
- tlbex.o tlbex-fault.o
+obj-y += cache.o
dma-default.o extable.o fault
.o \
+
init.o pgtable.o
tlbex.o tlbex-fault.o
obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
obj-$(CONFIG_64BIT) += pgtable-64.o
obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
obj-$(CONFIG_64BIT) += pgtable-64.o
@@
-32,14
+32,4
@@
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
-#
-# Choose one DMA coherency model
-#
-ifndef CONFIG_OWN_DMA
-obj-$(CONFIG_DMA_COHERENT) += dma-coherent.o
-obj-$(CONFIG_DMA_NONCOHERENT) += dma-noncoherent.o
-endif
-obj-$(CONFIG_DMA_IP27) += dma-ip27.o
-obj-$(CONFIG_DMA_IP32) += dma-ip32.o
-
EXTRA_AFLAGS := $(CFLAGS)
EXTRA_AFLAGS := $(CFLAGS)