Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc

[deliverable/linux.git] / arch / arm / mach-mxs / include / mach / debug-macro.S

diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S
index 6d9870448c3d808ac86d781bc20de13140bf2c53..90c6b7836ad3f8f108f708c7820f8b92a491c332 100644 (file)
--- a/arch/arm/mach-mxs/include/mach/debug-macro.S
+++ b/arch/arm/mach-mxs/include/mach/debug-macro.S
@@ -22,7 +22,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