diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:27 -0400 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/mach-shmobile | |
| parent | bd1274dc005c2cee41771a7cc616f4709a6e6323 (diff) | |
| parent | b511d75d6150892e67c8ebfa9dc8eb37ebd02aa3 (diff) | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/memory.h b/arch/arm/mach-shmobile/include/mach/memory.h index 377584e57e03..ad00c3c258f4 100644 --- a/arch/arm/mach-shmobile/include/mach/memory.h +++ b/arch/arm/mach-shmobile/include/mach/memory.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef __ASM_MACH_MEMORY_H | 1 | #ifndef __ASM_MACH_MEMORY_H |
| 2 | #define __ASM_MACH_MEMORY_H | 2 | #define __ASM_MACH_MEMORY_H |
| 3 | 3 | ||
| 4 | #define PHYS_OFFSET UL(CONFIG_MEMORY_START) | 4 | #define PLAT_PHYS_OFFSET UL(CONFIG_MEMORY_START) |
| 5 | #define MEM_SIZE UL(CONFIG_MEMORY_SIZE) | 5 | #define MEM_SIZE UL(CONFIG_MEMORY_SIZE) |
| 6 | 6 | ||
| 7 | /* DMA memory at 0xf6000000 - 0xffdfffff */ | 7 | /* DMA memory at 0xf6000000 - 0xffdfffff */ |