commit ab8fe93b2fb3ccc9ef46f7d6779b2f1813145d5c
author Olof Johansson <olof@lixom.net> Fri Nov 11 10:34:20 2011 -0800
committer Olof Johansson <olof@lixom.net> Fri Nov 11 10:34:20 2011 -0800
tree 2aa6e9429aee92f8007b34018cfa1a33a118119b
parent 09d37c4ba9b20d6b694bfd7339850ba9a826fb13
parent 0836b5cdd23d573bf7ec57f73ff774b3ad660bf4

Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes

arch/arm/mach-picoxcell/include/mach/debug-macro.S

diff --git a/arch/arm/mach-picoxcell/include/mach/debug-macro.S b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
index 8f2c234..58d4ee3 100644
--- a/arch/arm/mach-picoxcell/include/mach/debug-macro.S
+++ b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
@@ -14,7 +14,7 @@
 
 #define UART_SHIFT 2
 
-		.macro	addruart, rp, rv
+		.macro	addruart, rp, rv, tmp
 		ldr	\rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)
 		ldr	\rp, =PICOXCELL_UART1_BASE
 		.endm