Merge branch 'origin' into devel-stable

[~andy/linux] / arch / arm / mach-s5pv210 / include / mach / debug-macro.S

diff --git a/arch/arm/mach-s5pv210/include/mach/debug-macro.S b/arch/arm/mach-s5pv210/include/mach/debug-macro.S
index 8aec853310a7661f4e65991a9fc4a486af012122..7872f5c3dfc24271fb1853d8a6e86a7ad79ff051 100644 (file)
--- a/arch/arm/mach-s5pv210/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5pv210/include/mach/debug-macro.S
@@ -21,7 +21,7 @@
         * aligned and add in the offset when we load the value here.
         */
 
-       .macro addruart, rx
+       .macro addruart, rx, tmp
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1
                ldreq   \rx, = S3C_PA_UART