diff options
| author | Russell King | 2011-03-17 00:35:27 +0100 |
|---|---|---|
| committer | Russell King | 2011-03-17 00:35:27 +0100 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/plat-spear | |
| parent | Merge branch 'v6v7' into devel (diff) | |
| parent | ARM: 6747/1: P2V: Thumb2 support (diff) | |
| download | kernel-qcow2-linux-05e34754518b6a90d5c392790c032575fab12d66.tar.gz kernel-qcow2-linux-05e34754518b6a90d5c392790c032575fab12d66.tar.xz kernel-qcow2-linux-05e34754518b6a90d5c392790c032575fab12d66.zip | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/plat-spear')
| -rw-r--r-- | arch/arm/plat-spear/include/plat/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/include/plat/memory.h b/arch/arm/plat-spear/include/plat/memory.h index 27a4aba77343..7e3599e1104e 100644 --- a/arch/arm/plat-spear/include/plat/memory.h +++ b/arch/arm/plat-spear/include/plat/memory.h @@ -15,6 +15,6 @@ #define __PLAT_MEMORY_H /* Physical DRAM offset */ -#define PHYS_OFFSET UL(0x00000000) +#define PLAT_PHYS_OFFSET UL(0x00000000) #endif /* __PLAT_MEMORY_H */ |