aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-08-15 09:29:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-08-15 09:29:53 +0000
commitd16060d5a340164ff10b0d5909e6b0eed80aefc3 (patch)
tree5d64eaff5b5eb82bea31d4129e457c013fca37ee /target/linux/generic/patches-3.10
parente27f67b30a5c1a838fd4dc7762f43d41361ae4e2 (diff)
downloadupstream-d16060d5a340164ff10b0d5909e6b0eed80aefc3.tar.gz
upstream-d16060d5a340164ff10b0d5909e6b0eed80aefc3.tar.bz2
upstream-d16060d5a340164ff10b0d5909e6b0eed80aefc3.zip
kernel: fix a small #ifdef bug in the noncoherent dma check rework
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37791
Diffstat (limited to 'target/linux/generic/patches-3.10')
-rw-r--r--target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch b/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
index c18e7a3e21..42c8db3f92 100644
--- a/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
+++ b/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch
@@ -40,19 +40,21 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/arch/mips/include/asm/dma-coherence.h
+++ b/arch/mips/include/asm/dma-coherence.h
-@@ -9,7 +9,14 @@
+@@ -9,7 +9,16 @@
#ifndef __ASM_DMA_COHERENCE_H
#define __ASM_DMA_COHERENCE_H
+#ifdef CONFIG_DMA_MAYBE_COHERENT
extern int coherentio;
extern int hw_coherentio;
-+#elif defined(CONFIG_DMA_COHERENT)
++#else
++#ifdef CONFIG_DMA_COHERENT
+#define coherentio 1
+#else
+#define coherentio 0
+#endif
+#define hw_coherentio 0
++#endif /* CONFIG_DMA_MAYBE_COHERENT */
#endif
--- a/arch/mips/include/asm/mach-generic/dma-coherence.h