diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 13:31:09 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 13:31:09 -0500 |
| commit | d00a78d9409bee2e3bb7174a1810c0a655b4eaf4 (patch) | |
| tree | 54c0dbbaa81b7b540ef030ae83b2fb737f4e16ce /arch/arm/plat-omap/include | |
| parent | 31e5a9c1e13d66a4fd53911a52911fb992f1f734 (diff) | |
| parent | 3a6b1676c6f27f7fad1a3d6fab5a95f90b1e7402 (diff) | |
Merge remote-tracking branch 'rmk/p2v-stable' into linaro-2.6.38
Conflicts:
arch/arm/kernel/module.c
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 f8d922fb558..e6720aa2d55 100644 --- a/arch/arm/plat-omap/include/plat/memory.h +++ b/arch/arm/plat-omap/include/plat/memory.h @@ -37,9 +37,9 @@ * Physical DRAM offset. */ #if defined(CONFIG_ARCH_OMAP1) -#define PHYS_OFFSET UL(0x10000000) +#define PLAT_PHYS_OFFSET UL(0x10000000) #else -#define PHYS_OFFSET UL(0x80000000) +#define PLAT_PHYS_OFFSET UL(0x80000000) #endif /* diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index cec5d56db2e..8ff605c83ac 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h @@ -27,7 +27,7 @@ * 2. We assume printascii is called at least once before paging_init, * and addruart has a chance to read OMAP_UART_INFO */ -#define OMAP_UART_INFO (PHYS_OFFSET + 0x3ffc) +#define OMAP_UART_INFO (PLAT_PHYS_OFFSET + 0x3ffc) /* OMAP1 serial ports */ #define OMAP1_UART1_BASE 0xfffb0000 |