git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.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
e4dde91
..
a304593
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/
arch/arm/plat-mxc/include/mach/debug-macro.S
@@
-54,7
+54,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