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-ep93xx | |
| 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-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/memory.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h index 554064e90307..c9400cf0051c 100644 --- a/arch/arm/mach-ep93xx/include/mach/memory.h +++ b/arch/arm/mach-ep93xx/include/mach/memory.h | |||
| @@ -6,15 +6,15 @@ | |||
| 6 | #define __ASM_ARCH_MEMORY_H | 6 | #define __ASM_ARCH_MEMORY_H |
| 7 | 7 | ||
| 8 | #if defined(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) | 8 | #if defined(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) |
| 9 | #define PHYS_OFFSET UL(0x00000000) | 9 | #define PLAT_PHYS_OFFSET UL(0x00000000) |
| 10 | #elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) | 10 | #elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) |
| 11 | #define PHYS_OFFSET UL(0xc0000000) | 11 | #define PLAT_PHYS_OFFSET UL(0xc0000000) |
| 12 | #elif defined(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) | 12 | #elif defined(CONFIG_EP93XX_SDCE1_PHYS_OFFSET) |
| 13 | #define PHYS_OFFSET UL(0xd0000000) | 13 | #define PLAT_PHYS_OFFSET UL(0xd0000000) |
| 14 | #elif defined(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) | 14 | #elif defined(CONFIG_EP93XX_SDCE2_PHYS_OFFSET) |
| 15 | #define PHYS_OFFSET UL(0xe0000000) | 15 | #define PLAT_PHYS_OFFSET UL(0xe0000000) |
| 16 | #elif defined(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) | 16 | #elif defined(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET) |
| 17 | #define PHYS_OFFSET UL(0xf0000000) | 17 | #define PLAT_PHYS_OFFSET UL(0xf0000000) |
| 18 | #else | 18 | #else |
| 19 | #error "Kconfig bug: No EP93xx PHYS_OFFSET set" | 19 | #error "Kconfig bug: No EP93xx PHYS_OFFSET set" |
| 20 | #endif | 20 | #endif |