From fc8646ea8a4f24ff8267fa2eee0ee33327f1f36c Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Tue, 24 Jul 2018 00:28:39 +0930 Subject: arch-aspeed: Make AHBC and SDMC header guards unique Otherwise we get mysterious missing symbols if we include both those and the ast-{ahbc,sdmc}.h files. Signed-off-by: Andrew Jeffery Signed-off-by: Joel Stanley --- 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 66e29839e8..4f403c45d3 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 diff --git a/arch/arm/include/asm/arch-aspeed/regs-sdmc.h b/arch/arm/include/asm/arch-aspeed/regs-sdmc.h index 2861f3b2c9..2cc26d29aa 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 -- cgit v1.2.1