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-gemini | |
| 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-gemini')
| -rw-r--r-- | arch/arm/mach-gemini/include/mach/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-gemini/include/mach/memory.h b/arch/arm/mach-gemini/include/mach/memory.h index 2d14d5bf1f9f..a50915f764d8 100644 --- a/arch/arm/mach-gemini/include/mach/memory.h +++ b/arch/arm/mach-gemini/include/mach/memory.h | |||
| @@ -11,9 +11,9 @@ | |||
| 11 | #define __MACH_MEMORY_H | 11 | #define __MACH_MEMORY_H |
| 12 | 12 | ||
| 13 | #ifdef CONFIG_GEMINI_MEM_SWAP | 13 | #ifdef CONFIG_GEMINI_MEM_SWAP |
| 14 | # define PHYS_OFFSET UL(0x00000000) | 14 | # define PLAT_PHYS_OFFSET UL(0x00000000) |
| 15 | #else | 15 | #else |
| 16 | # define PHYS_OFFSET UL(0x10000000) | 16 | # define PLAT_PHYS_OFFSET UL(0x10000000) |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | #endif /* __MACH_MEMORY_H */ | 19 | #endif /* __MACH_MEMORY_H */ |