diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:45:06 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:45:06 -0700 |
| commit | 9b28b11e2a648f07c8481b9666ccf1c088e1ab74 (patch) | |
| tree | ac3db2d4ae69e393d8423bb8c9304c75023dc805 /arch/mips/include/asm/dma-mapping.h | |
| parent | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (diff) | |
| parent | 99aa18278e867574d72201b806f82ace07d4804b (diff) | |
Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/mips/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/mips/include/asm/dma-mapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |