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' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-mmp/include/mach/debug-macro.S
b/arch/arm/mach-mmp/include/mach/debug-macro.S
index
7e2ebd3
..
b6f14d2
100644
(file)
--- a/
arch/arm/mach-mmp/include/mach/debug-macro.S
+++ b/
arch/arm/mach-mmp/include/mach/debug-macro.S
@@
-11,7
+11,7
@@
#include <mach/addr-map.h>
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
ldr \rp, =APB_PHYS_BASE @ physical
ldr \rv, =APB_VIRT_BASE @ virtual
orr \rp, \rp, #0x00017000