summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-mxs
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-02-23 02:43:08 +0000
committerStefano Babic <sbabic@denx.de>2013-03-07 17:22:57 +0100
commiteb2996024b1592f77454302213d5bf0659684c7b (patch)
tree35ca02a4b3074724c7aa83417b3b2986a18a718c /arch/arm/include/asm/arch-mxs
parentaf73034c6ba131a93ed215098f43595637ef6ac3 (diff)
downloadtalos-obmc-uboot-eb2996024b1592f77454302213d5bf0659684c7b.tar.gz
talos-obmc-uboot-eb2996024b1592f77454302213d5bf0659684c7b.zip
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>
Diffstat (limited to 'arch/arm/include/asm/arch-mxs')
-rw-r--r--arch/arm/include/asm/arch-mxs/iomux.h5
1 files changed, 5 insertions, 0 deletions
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__*/
OpenPOWER on IntegriCloud