diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-08-15 09:29:53 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-08-15 09:29:53 +0000 |
| commit | 1d6c8fac173cf6b4050ea05009917fb305a40ae6 (patch) | |
| tree | d97cd97bb3de52cb320b2897a203e845bd259eea /target/linux/generic/patches-3.10 | |
| parent | c03bfe942c42f987ea7044212de5dcdc894946cf (diff) | |
| download | upstream-1d6c8fac173cf6b4050ea05009917fb305a40ae6.tar.gz upstream-1d6c8fac173cf6b4050ea05009917fb305a40ae6.tar.bz2 upstream-1d6c8fac173cf6b4050ea05009917fb305a40ae6.zip | |
kernel: fix a small #ifdef bug in the noncoherent dma check rework
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37791 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10')
| -rw-r--r-- | target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch | 6 |
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 |