diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 13:40:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 13:40:54 +0100 |
commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-davinci/include/mach/serial.h | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
download | blackbird-op-linux-cefd3e71efca6f4ef7f06f1fc507771d76072741.tar.gz blackbird-op-linux-cefd3e71efca6f4ef7f06f1fc507771d76072741.zip |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/serial.h')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/serial.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h index c9e6ce185a66..e347d88fef91 100644 --- a/arch/arm/mach-davinci/include/mach/serial.h +++ b/arch/arm/mach-davinci/include/mach/serial.h @@ -21,8 +21,9 @@ * macros in debug-macro.S. * * This area sits just below the page tables (see arch/arm/kernel/head.S). + * We define it as a relative offset from start of usable RAM. */ -#define DAVINCI_UART_INFO (PLAT_PHYS_OFFSET + 0x3ff8) +#define DAVINCI_UART_INFO_OFS 0x3ff8 #define DAVINCI_UART0_BASE (IO_PHYS + 0x20000) #define DAVINCI_UART1_BASE (IO_PHYS + 0x20400) |