ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362
authorBen Dooks <ben-linux@fluff.org>
Mon, 15 Mar 2010 23:08:03 +0000 (23:08 +0000)
committerBen Dooks <ben-linux@fluff.org>
Mon, 15 Mar 2010 23:11:41 +0000 (23:11 +0000)
Commit 4e6d488af37980d224cbf298224db6173673f362 either missed out the
following machine files or somehow managed to clash between merges.

Fixup the three files missing the second parameter to addruart macro
to allow them to build.

Fixes the following warnings in arch/arm/kernel/debug.c:
arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:167: Error: too many positional arguments
arch/arm/kernel/debug.S:183: Error: too many positional arguments

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
arch/arm/mach-s3c64xx/include/mach/debug-macro.S
arch/arm/mach-s5p6440/include/mach/debug-macro.S
arch/arm/mach-s5p6442/include/mach/debug-macro.S

index b18ac5266dfc333d9196a564a565341bb4168cb9..f9ab5d26052a38762c1559b51dbe1d46ab7786cc 100644 (file)
@@ -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
index 48cdb0da026c1c4939178b842e2838c94b2efbd3..1347d7f99079a1a3ff6ae4e92961f588724bebc2 100644 (file)
@@ -19,7 +19,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
index 1aae691e58ef3d4fc7b0b2c512cd4b87fe13b55b..bb6536147ffb0bd7c55c95d8eb796401824ceeb7 100644 (file)
@@ -15,7 +15,7 @@
 #include <mach/map.h>
 #include <plat/regs-serial.h>
 
-       .macro addruart, rx
+       .macro addruart, rx, rtmp
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1
                ldreq   \rx, = S3C_PA_UART