summaryrefslogtreecommitdiff
path: root/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 13:11:34 (GMT)
committerArnd Bergmann <arnd@arndb.de>2011-10-31 13:11:34 (GMT)
commit09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch)
treeacdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-lpc32xx/include/mach/debug-macro.S
parent2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff)
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff)
downloadlinux-fsl-qoriq-09fa31a322c8f03871a741cd1d26e5ca04aacbbd.tar.xz
Merge branch 'dt/gic' into highbank/soc
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-lpc32xx/include/mach/debug-macro.S')
-rw-r--r--arch/arm/mach-lpc32xx/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
index 629e744..351bd6c 100644
--- a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
@@ -20,7 +20,7 @@
* Debug output is hardcoded to standard UART 5
*/
- .macro addruart, rp, rv
+ .macro addruart, rp, rv, tmp
ldreq \rp, =0x40090000
ldrne \rv, =0xF4090000
.endm