git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p6442
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-s5p6442/include/mach/debug-macro.S
b/arch/arm/mach-s5p6442/include/mach/debug-macro.S
index
bb65361
..
e221320
100644
(file)
--- a/
arch/arm/mach-s5p6442/include/mach/debug-macro.S
+++ b/
arch/arm/mach-s5p6442/include/mach/debug-macro.S
@@
-15,13
+15,12
@@
#include <mach/map.h>
#include <plat/regs-serial.h>
#include <mach/map.h>
#include <plat/regs-serial.h>
- .macro addruart, rx, rtmp
- mrc p15, 0, \rx, c1, c0
- tst \rx, #1
- ldreq \rx, = S3C_PA_UART
- ldrne \rx, = S3C_VA_UART
+ .macro addruart, rp, rv
+ ldr \rp, = S3C_PA_UART
+ ldr \rv, = S3C_VA_UART
#if CONFIG_DEBUG_S3C_UART != 0
#if CONFIG_DEBUG_S3C_UART != 0
- add \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART)
+ add \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
+ add \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
#endif
.endm
#endif
.endm