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 'spi/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mv78xx0
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S
b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S
index
0489142
..
a7df02b
100644
(file)
--- a/
arch/arm/mach-mv78xx0/include/mach/debug-macro.S
+++ b/
arch/arm/mach-mv78xx0/include/mach/debug-macro.S
@@
-8,7
+8,7
@@
#include <mach/mv78xx0.h>
#include <mach/mv78xx0.h>
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
ldr \rp, =MV78XX0_REGS_PHYS_BASE
ldr \rv, =MV78XX0_REGS_VIRT_BASE
orr \rp, \rp, #0x00012000
ldr \rp, =MV78XX0_REGS_PHYS_BASE
ldr \rv, =MV78XX0_REGS_VIRT_BASE
orr \rp, \rp, #0x00012000