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.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
arm
/
mach-ebsa110
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-ebsa110/include/mach/debug-macro.S
b/arch/arm/mach-ebsa110/include/mach/debug-macro.S
index
ebbd89f
..
7ef5690
100644
(file)
--- a/
arch/arm/mach-ebsa110/include/mach/debug-macro.S
+++ b/
arch/arm/mach-ebsa110/include/mach/debug-macro.S
@@
-11,9
+11,10
@@
*
**/
- .macro addruart, rx, tmp
- mov \rx, #0xf0000000
- orr \rx, \rx, #0x00000be0
+ .macro addruart, rp, rv
+ mov \rp, #0xf0000000
+ orr \rp, \rp, #0x00000be0
+ mov \rp, \rv
.endm
#define UART_SHIFT 2