aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/include/mach/debug-macro.S
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 17:03:23 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 17:03:23 +0200
commit25fbe5ca4d0f37170451b682bd150a70f944aca0 (patch)
treec23f80847119d9f297206a37af2ad548ccdde802 /arch/arm/mach-vexpress/include/mach/debug-macro.S
parentff67a6b9aaddb2dea6ed4a3f7df8a0c6acf131c2 (diff)
downloadkernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.zip
kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.gz
kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.bz2
update other arm platforms from 3.2.72 and also merge some general arm code (boot)
Diffstat (limited to 'arch/arm/mach-vexpress/include/mach/debug-macro.S')
-rw-r--r--arch/arm/mach-vexpress/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/include/mach/debug-macro.S b/arch/arm/mach-vexpress/include/mach/debug-macro.S
index 050d65e..fd9e6c7 100644
--- a/arch/arm/mach-vexpress/include/mach/debug-macro.S
+++ b/arch/arm/mach-vexpress/include/mach/debug-macro.S
@@ -12,7 +12,7 @@
#define DEBUG_LL_UART_OFFSET 0x00009000
- .macro addruart,rp,rv
+ .macro addruart,rp,rv,tmp
mov \rp, #DEBUG_LL_UART_OFFSET
orr \rv, \rp, #0xf8000000 @ virtual base
orr \rp, \rp, #0x10000000 @ physical base