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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop33x
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-iop33x/include/mach/debug-macro.S
b/arch/arm/mach-iop33x/include/mach/debug-macro.S
index
a60c9ef
..
addb2da
100644
(file)
--- a/
arch/arm/mach-iop33x/include/mach/debug-macro.S
+++ b/
arch/arm/mach-iop33x/include/mach/debug-macro.S
@@
-11,7
+11,7
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
- .macro addruart, rx
+ .macro addruart, rx
, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ mmu enabled?
moveq \rx, #0xff000000 @ physical
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ mmu enabled?
moveq \rx, #0xff000000 @ physical