diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-13 09:53:08 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-13 10:04:52 -0500 |
| commit | d9a682a592ff5905d328c648fd30ee7fa12ce8ab (patch) | |
| tree | 5a6a09c4a9cef6f29dcab95f36db5ac6b6e6578d /arch/arm/mach-clps7500/core.c | |
| parent | 1e8b0416ca387d754410a4e5d6b92ad6e2fb00eb (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-clps7500/core.c')
| -rw-r--r-- | arch/arm/mach-clps7500/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 = { | |||
| 275 | .length = ISA_SIZE, | 275 | .length = ISA_SIZE, |
| 276 | .type = MT_DEVICE | 276 | .type = MT_DEVICE |
| 277 | }, { /* Flash */ | 277 | }, { /* Flash */ |
| 278 | .virtual = FLASH_BASE, | 278 | .virtual = CLPS7500_FLASH_BASE, |
| 279 | .pfn = __phys_to_pfn(FLASH_START), | 279 | .pfn = __phys_to_pfn(CLPS7500_FLASH_START), |
| 280 | .length = FLASH_SIZE, | 280 | .length = CLPS7500_FLASH_SIZE, |
| 281 | .type = MT_DEVICE | 281 | .type = MT_DEVICE |
| 282 | }, { /* LED */ | 282 | }, { /* LED */ |
| 283 | .virtual = LED_BASE, | 283 | .virtual = LED_BASE, |