diff options
| author | Andrew Jeffery <andrew@aj.id.au> | 2018-07-24 00:28:39 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-07-24 12:23:43 +0930 |
| commit | fc8646ea8a4f24ff8267fa2eee0ee33327f1f36c (patch) | |
| tree | e7bddcfcc750326ab95d828f6132dc05d5a9db42 | |
| parent | 3a13a8c48088b0c2a5dce1f1699993e70c94b397 (diff) | |
| download | talos-obmc-uboot-fc8646ea8a4f24ff8267fa2eee0ee33327f1f36c.tar.gz talos-obmc-uboot-fc8646ea8a4f24ff8267fa2eee0ee33327f1f36c.zip | |
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 <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
| -rw-r--r-- | arch/arm/include/asm/arch-aspeed/regs-ahbc.h | 4 | ||||
| -rw-r--r-- | 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 <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 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 |
