kernel: fix a small #ifdef bug in the noncoherent dma check rework
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 15 Aug 2013 09:29:53 +0000 (09:29 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 15 Aug 2013 09:29:53 +0000 (09:29 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37791 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch

index c18e7a3..42c8db3 100644 (file)
@@ -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