summaryrefslogtreecommitdiff
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:07:25 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:07:25 +0000
commit186f93ea1f274f4cde4a356401c1786c818ff881 (patch)
treede28f076c823d5423a5b4780f0d37554c242c982 /arch/arm/mach-u300
parent3560adf62075829393743667ff338dd8fd26a5c2 (diff)
parent4e6d488af37980d224cbf298224db6173673f362 (diff)
Merge branch 'tmpreg' into devel
Conflicts: arch/arm/Kconfig arch/arm/mach-ux500/include/mach/debug-macro.S
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/include/mach/debug-macro.S b/arch/arm/mach-u300/include/mach/debug-macro.S
index f3a1cbbeeab3..ca4a028c2661 100644
--- 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 adress using MMU, use this. */
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?