summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp4xx
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-ixp4xx
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-ixp4xx')
-rw-r--r--arch/arm/mach-ixp4xx/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
index 7c6a6912acde..893873eb2a0d 100644
--- a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
@@ -10,7 +10,7 @@
* 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, #0xc8000000