[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 9 insertions, 13 deletions

diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 4c3e101b96c9..7cc675c93e20 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -95,10 +95,6 @@
 #include <asm/hardware/cs89712.h>
 
 /* dynamic ioremap() areas */
-#define FLASH_START      0x00000000
-#define FLASH_SIZE       0x800000
-#define FLASH_WIDTH      4
-
 #define SRAM_START       0x60000000
 #define SRAM_SIZE        0xc000
 #define SRAM_WIDTH       4
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index c3a33b8a5aac..7e247c04d41c 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -275,9 +275,9 @@ static struct map_desc cl7500_io_desc[] __initdata = {
                 .length         = ISA_SIZE,
                 .type           = MT_DEVICE
         }, {    /* Flash        */
-                .virtual        = FLASH_BASE,
-                .pfn            = __phys_to_pfn(FLASH_START),
-                .length         = FLASH_SIZE,
+                .virtual        = CLPS7500_FLASH_BASE,
+                .pfn            = __phys_to_pfn(CLPS7500_FLASH_START),
+                .length         = CLPS7500_FLASH_SIZE,
                 .type           = MT_DEVICE
         }, {    /* LED          */
                 .virtual        = LED_BASE,
diff --git a/arch/arm/mach-clps7500/include/mach/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h
index d66578a3371c..a6ad1d44badf 100644
--- a/arch/arm/mach-clps7500/include/mach/hardware.h
+++ b/arch/arm/mach-clps7500/include/mach/hardware.h
@@ -39,9 +39,9 @@
 #define ISA_SIZE                0x00010000
 #define ISA_BASE                0xe1000000
 
-#define FLASH_START             0x01000000      /* XXX */
-#define FLASH_SIZE              0x01000000
-#define FLASH_BASE              0xe2000000
+#define CLPS7500_FLASH_START    0x01000000      /* XXX */
+#define CLPS7500_FLASH_SIZE     0x01000000
+#define CLPS7500_FLASH_BASE     0xe2000000
 
 #define LED_START               0x0302B000
 #define LED_SIZE                0x00001000
diff --git a/arch/arm/mach-h720x/include/mach/boards.h b/arch/arm/mach-h720x/include/mach/boards.h
index 079b279e1242..38b8e0d61fbf 100644
--- a/arch/arm/mach-h720x/include/mach/boards.h
+++ b/arch/arm/mach-h720x/include/mach/boards.h
@@ -19,9 +19,9 @@
 #ifdef CONFIG_ARCH_H7202
 
 /* FLASH */
-#define FLASH_VIRT              0xd0000000
-#define FLASH_PHYS              0x00000000
-#define FLASH_SIZE              0x02000000
+#define H720X_FLASH_VIRT        0xd0000000
+#define H720X_FLASH_PHYS        0x00000000
+#define H720X_FLASH_SIZE        0x02000000
 
 /* onboard LAN controller */
 # define ETH0_PHYS              0x08000000