From 167443183145eaebfe7e2e68b78e157cf527d3ef Mon Sep 17 00:00:00 2001 From: Eric Bénard Date: Thu, 5 Apr 2012 11:41:36 +0200 Subject: imx27-regs: fix .h usage in assembly file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/include/mach/imx27-regs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-imx/include/mach/imx27-regs.h') 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 */ -- cgit v1.2.3