diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 23:35:27 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 23:35:27 +0000 |
| commit | 05e34754518b6a90d5c392790c032575fab12d66 (patch) | |
| tree | 318d321262269eff585573ab2acf04a2ff2b65f4 /arch/arm/mach-sa1100 | |
| parent | Merge branch 'v6v7' into devel (diff) | |
| parent | ARM: 6747/1: P2V: Thumb2 support (diff) | |
| download | linux-dev-05e34754518b6a90d5c392790c032575fab12d66.tar.xz linux-dev-05e34754518b6a90d5c392790c032575fab12d66.zip | |
Merge branch 'p2v' into devel
Conflicts:
arch/arm/kernel/module.c
arch/arm/mach-s5pv210/sleep.S
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index 128a1dfa96b9..a44da6a2916c 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h @@ -12,7 +12,7 @@ /* * Physical DRAM offset is 0xc0000000 on the SA1100 */ -#define PHYS_OFFSET UL(0xc0000000) +#define PLAT_PHYS_OFFSET UL(0xc0000000) #ifndef __ASSEMBLY__ |