diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-13 14:53:08 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-13 15:04:52 +0000 |
| commit | d9a682a592ff5905d328c648fd30ee7fa12ce8ab (patch) | |
| tree | 5a6a09c4a9cef6f29dcab95f36db5ac6b6e6578d /arch/arm/mach-clps7500/include/mach | |
| parent | 1e8b0416ca387d754410a4e5d6b92ad6e2fb00eb (diff) | |
| download | kernel_samsung_smdk4412-d9a682a592ff5905d328c648fd30ee7fa12ce8ab.zip kernel_samsung_smdk4412-d9a682a592ff5905d328c648fd30ee7fa12ce8ab.tar.gz kernel_samsung_smdk4412-d9a682a592ff5905d328c648fd30ee7fa12ce8ab.tar.bz2 | |
[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-clps7500/include/mach')
| -rw-r--r-- | arch/arm/mach-clps7500/include/mach/hardware.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-clps7500/include/mach/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h index d66578a..a6ad1d4 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 |