arm: sc8830: fix redefined macro warnings

[profile/mobile/platform/kernel/u-boot-tm1.git] / arch / arm / include / asm / arch-sc8830 / chip_x30g / __hardware-sc8830.h

diff --git a/arch/arm/include/asm/arch-sc8830/chip_x30g/__hardware-sc8830.h b/arch/arm/include/asm/arch-sc8830/chip_x30g/__hardware-sc8830.h
index 2df05e1..73187b3 100644 (file)
--- a/arch/arm/include/asm/arch-sc8830/chip_x30g/__hardware-sc8830.h
+++ b/arch/arm/include/asm/arch-sc8830/chip_x30g/__hardware-sc8830.h
@@ -223,6 +223,9 @@
 #define SPRD_KPD_PHYS                  0X40250000
 #define SPRD_KPD_SIZE                  SZ_4K
 
+#ifdef SPRD_PWM_BASE
+#undef SPRD_PWM_BASE
+#endif
 #define SPRD_PWM_BASE                  SCI_IOMAP(0x20a000)
 #define SPRD_PWM_PHYS                  0X40260000
 #define SPRD_PWM_SIZE                  SZ_4K
@@ -465,6 +468,9 @@
 
 #define ANA_CTL_GLB_BASE               ( SPRD_MISC_BASE + 0x8800 )
 
+#ifdef ADC_BASE
+#undef ADC_BASE
+#endif
 #define ADC_BASE                       ((unsigned int)SPRD_ADI_BASE + 0x8300)
 
 #ifndef REGS_AHB_BASE