summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/include/mach/imx27-regs.h
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-04-05 11:41:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-05 12:43:38 +0200
commit167443183145eaebfe7e2e68b78e157cf527d3ef (patch)
tree2344770fafd71294984733dd2a572697bb980543 /arch/arm/mach-imx/include/mach/imx27-regs.h
parent2a6460cbb6f5e4ca02f988c7dac243882d7e080a (diff)
downloadbarebox-167443183145eaebfe7e2e68b78e157cf527d3ef.tar.gz
barebox-167443183145eaebfe7e2e68b78e157cf527d3ef.tar.xz
imx27-regs: fix .h usage in assembly file
7ab0a0a i.MX27: Added helper for setup chipselect control register added an helper which triggers the following error : arch/arm/mach-imx/include/mach/imx27-regs.h:243: Error: bad instruction `static inline void imx27_setup_weimcs(size_t cs,unsigned upper,unsigned lower,unsigned addional)' This patch fix this problem. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/include/mach/imx27-regs.h')
-rw-r--r--arch/arm/mach-imx/include/mach/imx27-regs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h
index 25ea04a556..437cc7d302 100644
--- a/arch/arm/mach-imx/include/mach/imx27-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx27-regs.h
@@ -240,11 +240,13 @@
#define IMX_CS4_BASE 0xD4000000
#define IMX_CS5_BASE 0xD6000000
+#ifndef __ASSEMBLY__
static inline void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, unsigned addional)
{
CSxU(cs) = upper;
CSxL(cs) = lower;
CSxA(cs) = addional;
}
+#endif /* __ASSEMBLY__ */
#endif /* _IMX27_REGS_H */