diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/plat-spear/include/plat/debug-macro.S | |
parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-spear/include/plat/debug-macro.S')
-rw-r--r-- | arch/arm/plat-spear/include/plat/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/include/plat/debug-macro.S b/arch/arm/plat-spear/include/plat/debug-macro.S index 8501bbf2c092..02b160a1ec9b 100644 --- a/arch/arm/plat-spear/include/plat/debug-macro.S +++ b/arch/arm/plat-spear/include/plat/debug-macro.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/amba/serial.h> | 14 | #include <linux/amba/serial.h> |
15 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
16 | 16 | ||
17 | .macro addruart, rp, rv | 17 | .macro addruart, rp, rv, tmp |
18 | mov \rp, #SPEAR_DBG_UART_BASE @ Physical base | 18 | mov \rp, #SPEAR_DBG_UART_BASE @ Physical base |
19 | mov \rv, #VA_SPEAR_DBG_UART_BASE @ Virtual base | 19 | mov \rv, #VA_SPEAR_DBG_UART_BASE @ Virtual base |
20 | .endm | 20 | .endm |