diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /arch/mips/mm/dma-default.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/mips/mm/dma-default.c')
| -rw-r--r-- | arch/mips/mm/dma-default.c | 2 |
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) | |||
| 35 | static inline int cpu_is_noncoherent_r10000(struct device *dev) | 35 | static inline int cpu_is_noncoherent_r10000(struct device *dev) |
| 36 | { | 36 | { |
| 37 | return !plat_device_is_coherent(dev) && | 37 | return !plat_device_is_coherent(dev) && |
| 38 | (current_cpu_data.cputype == CPU_R10000 && | 38 | (current_cpu_data.cputype == CPU_R10000 || |
| 39 | current_cpu_data.cputype == CPU_R12000); | 39 | current_cpu_data.cputype == CPU_R12000); |
| 40 | } | 40 | } |
| 41 | 41 | ||