diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-03-15 19:08:03 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-03-15 19:11:41 -0400 |
| commit | 0e17226f7cd289504724466f4298abc9bdfca3fe (patch) | |
| tree | 05b5e231233f671da083dc5a20eff61a825b55e5 /arch/arm | |
| parent | 65e543f12cb7f98cb041a759a21685569eec8695 (diff) | |
ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/debug-macro.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S index b18ac5266df..f9ab5d26052 100644 --- a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S +++ b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * aligned and add in the offset when we load the value here. | 21 | * aligned and add in the offset when we load the value here. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | .macro addruart, rx | 24 | .macro addruart, rx, rtmp |
| 25 | mrc p15, 0, \rx, c1, c0 | 25 | mrc p15, 0, \rx, c1, c0 |
| 26 | tst \rx, #1 | 26 | tst \rx, #1 |
| 27 | ldreq \rx, = S3C_PA_UART | 27 | ldreq \rx, = S3C_PA_UART |
diff --git a/arch/arm/mach-s5p6440/include/mach/debug-macro.S b/arch/arm/mach-s5p6440/include/mach/debug-macro.S index 48cdb0da026..1347d7f9907 100644 --- a/arch/arm/mach-s5p6440/include/mach/debug-macro.S +++ b/arch/arm/mach-s5p6440/include/mach/debug-macro.S | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | * aligned and add in the offset when we load the value here. | 19 | * aligned and add in the offset when we load the value here. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | .macro addruart, rx | 22 | .macro addruart, rx, rtmp |
| 23 | mrc p15, 0, \rx, c1, c0 | 23 | mrc p15, 0, \rx, c1, c0 |
| 24 | tst \rx, #1 | 24 | tst \rx, #1 |
| 25 | ldreq \rx, = S3C_PA_UART | 25 | ldreq \rx, = S3C_PA_UART |
diff --git a/arch/arm/mach-s5p6442/include/mach/debug-macro.S b/arch/arm/mach-s5p6442/include/mach/debug-macro.S index 1aae691e58e..bb6536147ff 100644 --- a/arch/arm/mach-s5p6442/include/mach/debug-macro.S +++ b/arch/arm/mach-s5p6442/include/mach/debug-macro.S | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <mach/map.h> | 15 | #include <mach/map.h> |
| 16 | #include <plat/regs-serial.h> | 16 | #include <plat/regs-serial.h> |
| 17 | 17 | ||
| 18 | .macro addruart, rx | 18 | .macro addruart, rx, rtmp |
| 19 | mrc p15, 0, \rx, c1, c0 | 19 | mrc p15, 0, \rx, c1, c0 |
| 20 | tst \rx, #1 | 20 | tst \rx, #1 |
| 21 | ldreq \rx, = S3C_PA_UART | 21 | ldreq \rx, = S3C_PA_UART |