Merge branch 'cross-platform/debug_ll' into imx/imx6q

[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-mxc / include / mach / debug-macro.S

diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index 07cfdbe8f06875a58c3b8e4166948ed333aacff2..72986013c1fb17fa595ae93fc1268eb9008e0e56 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -28,7 +28,7 @@
 
 #define UART_VADDR     IMX_IO_ADDRESS(UART_PADDR)
 
-               .macro  addruart, rp, rv
+               .macro  addruart, rp, rv, tmp
                ldr     \rp, =UART_PADDR        @ physical
                ldr     \rv, =UART_VADDR        @ virtual
                .endm