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/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
mach-h720x
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-h720x/include/mach/debug-macro.S
b/arch/arm/mach-h720x/include/mach/debug-macro.S
index
6294a13
..
a9ee8f0
100644
(file)
--- a/
arch/arm/mach-h720x/include/mach/debug-macro.S
+++ b/
arch/arm/mach-h720x/include/mach/debug-macro.S
@@
-14,7
+14,7
@@
.equ io_virt, IO_BASE
.equ io_phys, IO_START
.equ io_virt, IO_BASE
.equ io_phys, IO_START
- .macro addruart,
rx
+ .macro addruart,
rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #io_phys @ physical base address
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #io_phys @ physical base address