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

ab8fe93b · Olof Johansson · 09d37c4b · 0836b5cd · ab8fe93b
Commit ab8fe93b authored Nov 11, 2011 by Olof Johansson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- 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