Merge branch 'iommu/largepages' into amd-iommu/2.6.35

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c64xx / include / mach / debug-macro.S

diff --git a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
index b18ac5266dfc333d9196a564a565341bb4168cb9..f9ab5d26052a38762c1559b51dbe1d46ab7786cc 100644 (file)
--- a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S
+++ b/arch/arm/mach-s3c64xx/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, rtmp
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1
                ldreq   \rx, = S3C_PA_UART