git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-pxa/include/mach/debug-macro.S
b/arch/arm/mach-pxa/include/mach/debug-macro.S
index 55d6a175ab19074a2851e57ceeb958dd5c08eda0..01cf81393fe2d5e25787ea87b375aa510e754f2c 100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/debug-macro.S
+++ b/
arch/arm/mach-pxa/include/mach/debug-macro.S
@@
-13,7
+13,7
@@
#include "hardware.h"
- .macro addruart,
rx
+ .macro addruart,
rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0x40000000 @ physical