From 6014598f9e6ba63e49fcf7a59d696d3fac9cfa43 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Thu, 29 Oct 2015 15:54:41 +0800 Subject: [PATCH] mxs: regs-common.h must be wrapped with !__ASSEMBLY__ regs-common.h must be wrapped with #ifndef __ASSEMBLY__ Signed-off-by: Peng Fan Cc: Stefano Babic --- arch/arm/include/asm/arch-mxs/regs-lcdif.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mxs/regs-lcdif.h b/arch/arm/include/asm/arch-mxs/regs-lcdif.h index 8915d84d0d..fff6379a7e 100644 --- a/arch/arm/include/asm/arch-mxs/regs-lcdif.h +++ b/arch/arm/include/asm/arch-mxs/regs-lcdif.h @@ -13,9 +13,9 @@ #ifndef __MX28_REGS_LCDIF_H__ #define __MX28_REGS_LCDIF_H__ +#ifndef __ASSEMBLY__ #include -#ifndef __ASSEMBLY__ struct mxs_lcdif_regs { mxs_reg_32(hw_lcdif_ctrl) /* 0x00 */ mxs_reg_32(hw_lcdif_ctrl1) /* 0x10 */ -- 2.25.1