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/plat-mxc/include/mach | |
| 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/plat-mxc/include/mach')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 83861408133f..5d51cbb98893 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h | |||
| @@ -23,23 +23,23 @@ | |||
| 23 | 23 | ||
| 24 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) | 24 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) |
| 25 | # if defined CONFIG_ARCH_MX1 | 25 | # if defined CONFIG_ARCH_MX1 |
| 26 | # define PHYS_OFFSET MX1_PHYS_OFFSET | 26 | # define PLAT_PHYS_OFFSET MX1_PHYS_OFFSET |
| 27 | # elif defined CONFIG_MACH_MX21 | 27 | # elif defined CONFIG_MACH_MX21 |
| 28 | # define PHYS_OFFSET MX21_PHYS_OFFSET | 28 | # define PLAT_PHYS_OFFSET MX21_PHYS_OFFSET |
| 29 | # elif defined CONFIG_ARCH_MX25 | 29 | # elif defined CONFIG_ARCH_MX25 |
| 30 | # define PHYS_OFFSET MX25_PHYS_OFFSET | 30 | # define PLAT_PHYS_OFFSET MX25_PHYS_OFFSET |
| 31 | # elif defined CONFIG_MACH_MX27 | 31 | # elif defined CONFIG_MACH_MX27 |
| 32 | # define PHYS_OFFSET MX27_PHYS_OFFSET | 32 | # define PLAT_PHYS_OFFSET MX27_PHYS_OFFSET |
| 33 | # elif defined CONFIG_ARCH_MX3 | 33 | # elif defined CONFIG_ARCH_MX3 |
| 34 | # define PHYS_OFFSET MX3x_PHYS_OFFSET | 34 | # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET |
| 35 | # elif defined CONFIG_ARCH_MXC91231 | 35 | # elif defined CONFIG_ARCH_MXC91231 |
| 36 | # define PHYS_OFFSET MXC91231_PHYS_OFFSET | 36 | # define PLAT_PHYS_OFFSET MXC91231_PHYS_OFFSET |
| 37 | # elif defined CONFIG_ARCH_MX50 | 37 | # elif defined CONFIG_ARCH_MX50 |
| 38 | # define PHYS_OFFSET MX50_PHYS_OFFSET | 38 | # define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET |
| 39 | # elif defined CONFIG_ARCH_MX51 | 39 | # elif defined CONFIG_ARCH_MX51 |
| 40 | # define PHYS_OFFSET MX51_PHYS_OFFSET | 40 | # define PLAT_PHYS_OFFSET MX51_PHYS_OFFSET |
| 41 | # elif defined CONFIG_ARCH_MX53 | 41 | # elif defined CONFIG_ARCH_MX53 |
| 42 | # define PHYS_OFFSET MX53_PHYS_OFFSET | 42 | # define PLAT_PHYS_OFFSET MX53_PHYS_OFFSET |
| 43 | # endif | 43 | # endif |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||