[PATCH u-boot 3/4] arch-aspeed: Make AHBC and SDMC header guards unique

Andrew Jeffery andrew at aj.id.au
Tue Jul 24 00:58:39 AEST 2018


Otherwise we get mysterious missing symbols if we include both those and
the ast-{ahbc,sdmc}.h files.

Signed-off-by: Andrew Jeffery <andrew at aj.id.au>
---
 arch/arm/include/asm/arch-aspeed/regs-ahbc.h | 4 ++--
 arch/arm/include/asm/arch-aspeed/regs-sdmc.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/include/asm/arch-aspeed/regs-ahbc.h b/arch/arm/include/asm/arch-aspeed/regs-ahbc.h
index 66e29839e8f1..4f403c45d3a5 100644
--- a/arch/arm/include/asm/arch-aspeed/regs-ahbc.h
+++ b/arch/arm/include/asm/arch-aspeed/regs-ahbc.h
@@ -10,8 +10,8 @@
  *    1. 2012/12/29 Ryan Chen Create
  *
  ******************************************************************************/
-#ifndef __AST_AHBC_H
-#define __AST_AHBC_H
+#ifndef __AST_REGS_AHBC_H
+#define __AST_REGS_AHBC_H
 
 #include <asm/arch/aspeed.h>
 
diff --git a/arch/arm/include/asm/arch-aspeed/regs-sdmc.h b/arch/arm/include/asm/arch-aspeed/regs-sdmc.h
index 2861f3b2c947..2cc26d29aa9e 100644
--- a/arch/arm/include/asm/arch-aspeed/regs-sdmc.h
+++ b/arch/arm/include/asm/arch-aspeed/regs-sdmc.h
@@ -10,8 +10,8 @@
  *    1. 2012/12/29 Ryan Chen Create
  *
  ******************************************************************************/
-#ifndef __AST_SDMC_H
-#define __AST_SDMC_H
+#ifndef __AST_REGS_SDMC_H
+#define __AST_REGS_SDMC_H
 
 /*
  *  Register for SDMC
-- 
2.17.1



More information about the openbmc mailing list