projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' into for-linus
[linux-2.6-block.git]
/
arch
/
arm
/
mach-u300
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-u300/include/mach/debug-macro.S
b/arch/arm/mach-u300/include/mach/debug-macro.S
index d591fe13ed130870069cd9af5569d8166e132315..92c12420256ffdc518d8a4102198e42365039032 100644
(file)
--- a/
arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/
arch/arm/mach-u300/include/mach/debug-macro.S
@@
-10,7
+10,7
@@
*/
#include <mach/hardware.h>
- .macro addruart,
rx
+ .macro addruart,
rx, tmp
/* If we move the address using MMU, use this. */
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?