Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e17226f authored Mar 15, 2010 by Ben Dooks

ARM: SAMSUNG: Fixup commit 4e6d488a



Commit 4e6d488a 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>

parent 65e543f1

arch/arm/mach-s3c64xx/include/mach/debug-macro.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@
	* aligned and add in the offset when we load the value here.		* 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		mrc p15, 0, \rx, c1, c0
	tst \rx, #1		tst \rx, #1
	ldreq \rx, = S3C_PA_UART		ldreq \rx, = S3C_PA_UART

arch/arm/mach-s5p6440/include/mach/debug-macro.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	* aligned and add in the offset when we load the value here.		* 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		mrc p15, 0, \rx, c1, c0
	tst \rx, #1		tst \rx, #1
	ldreq \rx, = S3C_PA_UART		ldreq \rx, = S3C_PA_UART

arch/arm/mach-s5p6442/include/mach/debug-macro.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@
	#include <mach/map.h>		#include <mach/map.h>
	#include <plat/regs-serial.h>		#include <plat/regs-serial.h>

	.macro addruart, rx		.macro addruart, rx, rtmp
	mrc p15, 0, \rx, c1, c0		mrc p15, 0, \rx, c1, c0
	tst \rx, #1		tst \rx, #1
	ldreq \rx, = S3C_PA_UART		ldreq \rx, = S3C_PA_UART