From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 15 Aug 2013 09:29:53 +0000 (+0000)
Subject: kernel: fix a small #ifdef bug in the noncoherent dma check rework
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=d16060d5a340164ff10b0d5909e6b0eed80aefc3;p=openwrt%2Fstaging%2Fmkresin.git

kernel: fix a small #ifdef bug in the noncoherent dma check rework

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37791
---

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