aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x/include/mach
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-13 09:53:08 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-13 10:04:52 -0500
commitd9a682a592ff5905d328c648fd30ee7fa12ce8ab (patch)
tree5a6a09c4a9cef6f29dcab95f36db5ac6b6e6578d /arch/arm/mach-clps711x/include/mach
parent1e8b0416ca387d754410a4e5d6b92ad6e2fb00eb (diff)
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-clps711x/include/mach')
-rw-r--r--arch/arm/mach-clps711x/include/mach/hardware.h4
1 files changed, 0 insertions, 4 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 @@
95#include <asm/hardware/cs89712.h> 95#include <asm/hardware/cs89712.h>
96 96
97/* dynamic ioremap() areas */ 97/* dynamic ioremap() areas */
98#define FLASH_START 0x00000000
99#define FLASH_SIZE 0x800000
100#define FLASH_WIDTH 4
101
102#define SRAM_START 0x60000000 98#define SRAM_START 0x60000000
103#define SRAM_SIZE 0xc000 99#define SRAM_SIZE 0xc000
104#define SRAM_WIDTH 4 100#define SRAM_WIDTH 4