aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/dma-default.c
diff options
context:
space:
mode:
authorMaxime Bizon <mbizon@freebox.fr>2007-08-31 11:03:14 +0200
committerRalf Baechle <ralf@linux-mips.org>2007-09-10 21:25:28 +0100
commitd344dd52e50f4440810b641077282bfa1fd65d88 (patch)
tree0c43bf6dbaf772ac45aab5f6c66d973bc4635749 /arch/mips/mm/dma-default.c
parent[MIPS] Provide empty irq_enable_hazard definition for legacy and R1 cores. (diff)
downloadlinux-dev-d344dd52e50f4440810b641077282bfa1fd65d88.tar.xz
linux-dev-d344dd52e50f4440810b641077282bfa1fd65d88.zip
[MIPS] R10000: Fix wrong test in dma-default.c
Signed-off-by: Maxime Bizon <mbizon@freebox.fr> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/dma-default.c')
-rw-r--r--arch/mips/mm/dma-default.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 76903c727647..f60b3dc0fc62 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
static inline int cpu_is_noncoherent_r10000(struct device *dev)
{
return !plat_device_is_coherent(dev) &&
- (current_cpu_data.cputype == CPU_R10000 &&
+ (current_cpu_data.cputype == CPU_R10000 ||
current_cpu_data.cputype == CPU_R12000);
}