diff options
| author | Arnd Bergmann | 2011-10-31 23:11:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2011-11-01 00:25:01 +0100 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-mxs/include/mach/debug-macro.S | |
| parent | Merge branch 'depends/rmk/gpio' into next/fixes (diff) | |
| parent | ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H (diff) | |
| download | kernel-qcow2-linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.tar.gz kernel-qcow2-linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.tar.xz kernel-qcow2-linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.zip | |
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/mach-mxs/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S index 79650a1ad78d..714570d83668 100644 --- a/arch/arm/mach-mxs/include/mach/debug-macro.S +++ b/arch/arm/mach-mxs/include/mach/debug-macro.S @@ -30,7 +30,7 @@ #define UART_VADDR MXS_IO_ADDRESS(UART_PADDR) - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp ldr \rp, =UART_PADDR @ physical ldr \rv, =UART_VADDR @ virtual .endm |