Merge branch 'tmpreg' into devel

[net-next-2.6.git] / arch / arm / mach-ux500 / include / mach / debug-macro.S

diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S
index 8de225e022356d651a261bf9f1debc9eec2e9a64..09cbfda8aee5af8d6359fb25a0a525d99f11414f 100644 (file)
--- a/arch/arm/mach-ux500/include/mach/debug-macro.S
+++ b/arch/arm/mach-ux500/include/mach/debug-macro.S
@@ -10,7 +10,7 @@
  */
 #include <mach/hardware.h>
 
-       .macro  addruart,rx
+       .macro  addruart, rx, tmp
        mrc     p15, 0, \rx, c1, c0
        tst     \rx, #1                                 @ MMU enabled?
        ldreq   \rx, =U8500_UART2_BASE                  @ no, physical address