diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
| commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
| tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-realview | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S index 90b687cbe04e..fb4901c4ef04 100644 --- a/arch/arm/mach-realview/include/mach/debug-macro.S +++ b/arch/arm/mach-realview/include/mach/debug-macro.S | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #error "Unknown RealView platform" | 33 | #error "Unknown RealView platform" |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | .macro addruart, rp, rv | 36 | .macro addruart, rp, rv, tmp |
| 37 | mov \rp, #DEBUG_LL_UART_OFFSET | 37 | mov \rp, #DEBUG_LL_UART_OFFSET |
| 38 | orr \rv, \rp, #0xfb000000 @ virtual base | 38 | orr \rv, \rp, #0xfb000000 @ virtual base |
| 39 | orr \rp, \rp, #0x10000000 @ physical base | 39 | orr \rp, \rp, #0x10000000 @ physical base |