summary refs log tree commit diff
path: root/arch/arm/mach-ixp2000
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-01 23:26:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-12 17:27:52 +0000
commit4e6d488af37980d224cbf298224db6173673f362 (patch)
tree5e5d7276f321c239c129031892ec08a3ba034c2f /arch/arm/mach-ixp2000
parent200b7a8dc09504bc0aedac567a307a6e533f39e5 (diff)
downloadlinux-4e6d488af37980d224cbf298224db6173673f362.tar.gz
ARM: 5910/1: ARM: Add tmp register for addruart and loadsp
Otherwise more complicated uart configuration won't be possible.
We can use r1 for tmp register for both head.S and debug.S.

NOTE: This patch depends on another patch to add the the tmp register
into all debug-macro.S files. That can be done with:

$ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/"
	arch/arm/*/include/*/debug-macro.S

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp2000')
-rw-r--r--arch/arm/mach-ixp2000/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/include/mach/debug-macro.S b/arch/arm/mach-ixp2000/include/mach/debug-macro.S
index 904ff56d2246..6a827681680f 100644
--- a/arch/arm/mach-ixp2000/include/mach/debug-macro.S
+++ b/arch/arm/mach-ixp2000/include/mach/debug-macro.S
@@ -11,7 +11,7 @@
  *
 */
 
-		.macro  addruart,rx
+		.macro  addruart, rx, tmp
 		mrc	p15, 0, \rx, c1, c0
 		tst	\rx, #1			@ MMU enabled?
 		moveq	\rx, #0xc0000000	@ Physical base