diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-13 10:02:41 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-13 10:05:03 -0500 |
commit | 8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320 (patch) | |
tree | 24b4085ac1fca3fce15880b9d936dc2f17718654 /arch/arm/mach-clps711x | |
parent | d9a682a592ff5905d328c648fd30ee7fa12ce8ab (diff) |
[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-clps711x')
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/hardware.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h index 7cc675c93e20..b3ebe9e4871f 100644 --- a/arch/arm/mach-clps711x/include/mach/hardware.h +++ b/arch/arm/mach-clps711x/include/mach/hardware.h | |||
@@ -94,16 +94,6 @@ | |||
94 | #include <asm/hardware/ep7212.h> | 94 | #include <asm/hardware/ep7212.h> |
95 | #include <asm/hardware/cs89712.h> | 95 | #include <asm/hardware/cs89712.h> |
96 | 96 | ||
97 | /* dynamic ioremap() areas */ | ||
98 | #define SRAM_START 0x60000000 | ||
99 | #define SRAM_SIZE 0xc000 | ||
100 | #define SRAM_WIDTH 4 | ||
101 | |||
102 | #define BOOTROM_START 0x70000000 | ||
103 | #define BOOTROM_SIZE 0x80 | ||
104 | #define BOOTROM_WIDTH 4 | ||
105 | |||
106 | |||
107 | /* static cdb89712_map_io() areas */ | 97 | /* static cdb89712_map_io() areas */ |
108 | #define REGISTER_START 0x80000000 | 98 | #define REGISTER_START 0x80000000 |
109 | #define REGISTER_SIZE 0x4000 | 99 | #define REGISTER_SIZE 0x4000 |
@@ -194,14 +184,6 @@ | |||
194 | #define CEIVA_FLASH_SIZE 0x100000 | 184 | #define CEIVA_FLASH_SIZE 0x100000 |
195 | #define CEIVA_FLASH_WIDTH 2 | 185 | #define CEIVA_FLASH_WIDTH 2 |
196 | 186 | ||
197 | #define SRAM_START 0x60000000 | ||
198 | #define SRAM_SIZE 0xc000 | ||
199 | #define SRAM_WIDTH 4 | ||
200 | |||
201 | #define BOOTROM_START 0x70000000 | ||
202 | #define BOOTROM_SIZE 0x80 | ||
203 | #define BOOTROM_WIDTH 4 | ||
204 | |||
205 | /* | 187 | /* |
206 | * SED1355 LCD controller | 188 | * SED1355 LCD controller |
207 | */ | 189 | */ |