From: Peng Fan <Peng.Fan@freescale.com>
Date: Thu, 29 Oct 2015 07:54:41 +0000 (+0800)
Subject: mxs: regs-common.h must be wrapped with !__ASSEMBLY__
X-Git-Tag: v2016.01-rc1~2^2~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6014598f9e6ba63e49fcf7a59d696d3fac9cfa43;p=oweals%2Fu-boot.git

mxs: regs-common.h must be wrapped with !__ASSEMBLY__

regs-common.h must be wrapped with #ifndef __ASSEMBLY__

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
---

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 <asm/imx-common/regs-common.h>
 
-#ifndef	__ASSEMBLY__
 struct mxs_lcdif_regs {
 	mxs_reg_32(hw_lcdif_ctrl)		/* 0x00 */
 	mxs_reg_32(hw_lcdif_ctrl1)		/* 0x10 */