aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-l7200/include/mach/debug-macro.S
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 05:50:33 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 05:50:33 +0200
commit817ba283acf2d7b5aa073b96fd989f336fcff72a (patch)
tree5dd15d9914b74e5575025bccb51c99b745b83525 /arch/arm/mach-l7200/include/mach/debug-macro.S
parent3b3a015ad4ab1ad0cf707ccbaef1dbe965993a4a (diff)
downloadkernel_samsung_smdk4412-817ba283acf2d7b5aa073b96fd989f336fcff72a.zip
kernel_samsung_smdk4412-817ba283acf2d7b5aa073b96fd989f336fcff72a.tar.gz
kernel_samsung_smdk4412-817ba283acf2d7b5aa073b96fd989f336fcff72a.tar.bz2
merge more stuff from 3.2.72
Diffstat (limited to 'arch/arm/mach-l7200/include/mach/debug-macro.S')
-rw-r--r--arch/arm/mach-l7200/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-l7200/include/mach/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S
index b0a2db7..0b4e760 100644
--- a/arch/arm/mach-l7200/include/mach/debug-macro.S
+++ b/arch/arm/mach-l7200/include/mach/debug-macro.S
@@ -14,7 +14,7 @@
.equ io_virt, IO_BASE
.equ io_phys, IO_START
- .macro addruart, rp, rv
+ .macro addruart, rp, rv, tmp
mov \rp, #0x00044000 @ UART1
@ mov \rp, #0x00045000 @ UART2
add \rv, \rp, #io_virt @ virtual address