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-omap/include | |
| 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-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/memory.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/serial.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/memory.h b/arch/arm/plat-omap/include/plat/memory.h index f8d922fb5584..e6720aa2d553 100644 --- a/arch/arm/plat-omap/include/plat/memory.h +++ b/arch/arm/plat-omap/include/plat/memory.h | |||
| @@ -37,9 +37,9 @@ | |||
| 37 | * Physical DRAM offset. | 37 | * Physical DRAM offset. |
| 38 | */ | 38 | */ |
| 39 | #if defined(CONFIG_ARCH_OMAP1) | 39 | #if defined(CONFIG_ARCH_OMAP1) |
| 40 | #define PHYS_OFFSET UL(0x10000000) | 40 | #define PLAT_PHYS_OFFSET UL(0x10000000) |
| 41 | #else | 41 | #else |
| 42 | #define PHYS_OFFSET UL(0x80000000) | 42 | #define PLAT_PHYS_OFFSET UL(0x80000000) |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | /* | 45 | /* |
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index cec5d56db2eb..8ff605c83aca 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | * 2. We assume printascii is called at least once before paging_init, | 27 | * 2. We assume printascii is called at least once before paging_init, |
| 28 | * and addruart has a chance to read OMAP_UART_INFO | 28 | * and addruart has a chance to read OMAP_UART_INFO |
| 29 | */ | 29 | */ |
| 30 | #define OMAP_UART_INFO (PHYS_OFFSET + 0x3ffc) | 30 | #define OMAP_UART_INFO (PLAT_PHYS_OFFSET + 0x3ffc) |
| 31 | 31 | ||
| 32 | /* OMAP1 serial ports */ | 32 | /* OMAP1 serial ports */ |
| 33 | #define OMAP1_UART1_BASE 0xfffb0000 | 33 | #define OMAP1_UART1_BASE 0xfffb0000 |