From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 18 May 2011 12:14:36 +0000 (+0100)
Subject: MIPS: Kludge IP27 build for 2.6.39.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a5602a3273774c720aaf165ff670e5b85e5910a5;p=deliverable%2Flinux.git

MIPS: Kludge IP27 build for 2.6.39.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index 655f849bd08d..7aa37ddfca4b 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -5,7 +5,9 @@
 #include <asm/cache.h>
 #include <asm-generic/dma-coherent.h>
 
+#ifndef CONFIG_SGI_IP27	/* Kludge to fix 2.6.39 build for IP27 */
 #include <dma-coherence.h>
+#endif
 
 extern struct dma_map_ops *mips_dma_map_ops;