diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 17:32:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 22:30:01 +0100 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /arch/mips/lib/memcpy-inatomic.S | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
| download | kernel_samsung_smdk4412-9d45cf9e36bf9bcf16df6e1cbf049807c8402823.zip kernel_samsung_smdk4412-9d45cf9e36bf9bcf16df6e1cbf049807c8402823.tar.gz kernel_samsung_smdk4412-9d45cf9e36bf9bcf16df6e1cbf049807c8402823.tar.bz2 | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/lib/memcpy-inatomic.S')
| -rw-r--r-- | arch/mips/lib/memcpy-inatomic.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib/memcpy-inatomic.S b/arch/mips/lib/memcpy-inatomic.S index 736d0fb..68853a0 100644 --- a/arch/mips/lib/memcpy-inatomic.S +++ b/arch/mips/lib/memcpy-inatomic.S @@ -21,7 +21,7 @@ * end of memory on some systems. It's also a seriously bad idea on non * dma-coherent systems. */ -#if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) +#ifdef CONFIG_DMA_NONCOHERENT #undef CONFIG_CPU_HAS_PREFETCH #endif #ifdef CONFIG_MIPS_MALTA |