diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-19 03:44:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-19 03:44:37 -0500 |
| commit | 3ac3ba0b396fd99550e08034b0e4c27fdf39c252 (patch) | |
| tree | f9f69fac41d66540a37a33808714d055d702328f /arch/arm/mach-clps7500/core.c | |
| parent | 934352f214b3251eb0793c1209d346595a661d80 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
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, |