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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-s5pv210/include/mach/debug-macro.S
b/arch/arm/mach-s5pv210/include/mach/debug-macro.S
index
7872f5c
..
169fe65
100644
(file)
--- a/
arch/arm/mach-s5pv210/include/mach/debug-macro.S
+++ b/
arch/arm/mach-s5pv210/include/mach/debug-macro.S
@@
-21,13
+21,12
@@
* 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, tmp
- 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