projects
/
profile
/
mobile
/
platform
/
kernel
/
u-boot-tm1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
arm: sc8830: fix redefined macro warnings
[profile/mobile/platform/kernel/u-boot-tm1.git]
/
arch
/
arm
/
include
/
asm
/
arch-sc8830
/
sprd_reg_base.h
diff --git
a/arch/arm/include/asm/arch-sc8830/sprd_reg_base.h
b/arch/arm/include/asm/arch-sc8830/sprd_reg_base.h
index
599664d
..
b5c67ad
100644
(file)
--- a/
arch/arm/include/asm/arch-sc8830/sprd_reg_base.h
+++ b/
arch/arm/include/asm/arch-sc8830/sprd_reg_base.h
@@
-214,6
+214,9
@@
extern "C"
#define EFUSE_BASE CTL_BASE_EFUSE
#define GPIO_BASE CTL_BASE_GPIO
#define PWM_BASE CTL_BASE_PWM
+#ifdef GREG_BASE
+#undef GREG_BASE
+#endif
#define GREG_BASE CTL_BASE_GLB_REG
#define WDG_BASE 0x40038040 //CHGR_WDG:0x820003C0 WDG:0x82000040