From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 23 Feb 2013 02:43:08 +0000 (+0000)
Subject: mxs: Fix iomux.h to not break build during assembly stage
X-Git-Tag: v2013.04-rc2~24^2~1^2~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eb2996024b1592f77454302213d5bf0659684c7b;p=u-boot

mxs: Fix iomux.h to not break build during assembly stage

This fixes the build failure when included in mx23_olinuxino.h board
config; the addition of "asm/types.h" is due "u32" being otherwise
undefined.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/arch/arm/include/asm/arch-mxs/iomux.h b/arch/arm/include/asm/arch-mxs/iomux.h
index 7abdf58b8b..42887154c4 100644
--- a/arch/arm/include/asm/arch-mxs/iomux.h
+++ b/arch/arm/include/asm/arch-mxs/iomux.h
@@ -21,6 +21,10 @@
 #ifndef __MACH_MXS_IOMUX_H__
 #define __MACH_MXS_IOMUX_H__
 
+#ifndef __ASSEMBLY__
+
+#include <asm/types.h>
+
 /*
  * IOMUX/PAD Bit field definitions
  *
@@ -165,4 +169,5 @@ int mxs_iomux_setup_pad(iomux_cfg_t pad);
  */
 int mxs_iomux_setup_multiple_pads(const iomux_cfg_t *pad_list, unsigned count);
 
+#endif /* __ASSEMBLY__ */
 #endif /* __MACH_MXS_IOMUX_H__*/