kernel/3.1[02]: move MTD root device setup code to mtdcore

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 131-improve_noncoherent_dma_checks.patch

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 c18e7a3e21d39b32bf635c5af83ab6e9c0431b0a..a20d3d96b83b8d84f032ba224c6b51effc7662e5 100644 (file)
--- 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
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -296,7 +296,7 @@ config MIPS_MALTA
+@@ -297,7 +297,7 @@ config MIPS_MALTA
        select CEVT_R4K
        select CSRC_R4K
        select CSRC_GIC
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        select GENERIC_ISA_DMA
        select HAVE_PCSPKR_PLATFORM
        select IRQ_CPU
-@@ -947,6 +947,10 @@ config FW_CFE
+@@ -948,6 +948,10 @@ config FW_CFE
  config ARCH_DMA_ADDR_T_64BIT
        def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
  
@@ -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