[PATCH 1/1] UBUNTU: ARM: IMX51: fix imx51 header change compatibility with other archs

[Brad Figg]

The imx51 patchset added the inclusion of other header files to a
core header which not all other architectures support. The code
has been fenced to make it more friendly.

Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 arch/arm/include/asm/dma.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 1250f48..3f255a3 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -2,9 +2,11 @@
 #define __ASM_ARM_DMA_H
 
 #include <asm/memory.h>
+#ifdef CONFIG_ARCH_MXC_CANONICAL
 #include <asm/system.h>
 #include <asm/scatterlist.h>
 #include <mach/dma.h>
+#endif
 
 /*
  * This is the maximum virtual address which can be DMA'd from.
-- 
1.6.0.4