lkml.org 
[lkml]   [2010]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-next: manual merge of the samsung tree with the arm tree
Hi Ben,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5p6442/include/mach/debug-macro.S between commit
4e6d488af37980d224cbf298224db6173673f362 ("ARM: 5910/1: ARM: Add tmp
register for addruart and loadsp") from the arm tree and commit
5f7f6a4a0df9b43051d57fdb8ea96c083247a08f ("ARM: S5P6442: Add Samsung
S5P6442 CPU support") from the samsung tree.

This conflict is a bit strange since this is a new file, but git is a bit
too clever :-)

I fixed it up (see the change from the samsung tree below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --git a/arch/arm/mach-s5p6442/include/mach/debug-macro.S b/arch/arm/mach-s5p6442/include/mach/debug-macro.S
index 1aae691..441962c 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 @@
#include <mach/map.h>
#include <plat/regs-serial.h>

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

\
 
 \ /
  Last update: 2010-02-25 00:51    [W:0.033 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site