From bcd15eb00498861ac947a361f57ba077579d87b8 Mon Sep 17 00:00:00 2001
From: Maxime Bizon <mbizon@freebox.fr>
Date: Fri, 31 Aug 2007 11:03:14 +0200
Subject: [PATCH] --- yaml --- r: 64850 b: refs/heads/master c:
 8bce4e9de113e2957c74cc4ce36fbd6eff47d24d h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/mm/dma-default.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1f38be7c1d7..098210c1df1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4af2b1454da7a2feec071a6a50dd957df7d0b7a7
+refs/heads/master: 8bce4e9de113e2957c74cc4ce36fbd6eff47d24d
diff --git a/trunk/arch/mips/mm/dma-default.c b/trunk/arch/mips/mm/dma-default.c
index 76903c727647..f60b3dc0fc62 100644
--- a/trunk/arch/mips/mm/dma-default.c
+++ b/trunk/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);
 }