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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[pandora-kernel.git]
/
arch
/
arm
/
mach-shark
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-shark/include/mach/debug-macro.S
b/arch/arm/mach-shark/include/mach/debug-macro.S
index
5ea24d4
..
a473f55
100644
(file)
--- a/
arch/arm/mach-shark/include/mach/debug-macro.S
+++ b/
arch/arm/mach-shark/include/mach/debug-macro.S
@@
-11,9
+11,10
@@
*
*/
- .macro addruart, rx, tmp
- mov \rx, #0xe0000000
- orr \rx, \rx, #0x000003f8
+ .macro addruart, rp, rv
+ mov \rp, #0xe0000000
+ orr \rp, \rp, #0x000003f8
+ mov \rv, \rp
.endm
.macro senduart,rd,rx