Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.…

…6-ji into fixes
mariux64 · Nov 11, 2011 · ab8fe93 · ab8fe93
2 parents 09d37c4 + 0836b5c
commit ab8fe93
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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