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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-msm/include/mach/debug-macro.S
b/arch/arm/mach-msm/include/mach/debug-macro.S
index
646b99e
..
2dc73cc
100644
(file)
--- a/
arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/
arch/arm/mach-msm/include/mach/debug-macro.S
@@
-20,7
+20,7
@@
#include <mach/msm_iomap.h>
#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE)
#include <mach/msm_iomap.h>
#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE)
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
ldr \rp, =MSM_DEBUG_UART_PHYS
ldr \rv, =MSM_DEBUG_UART_BASE
.endm
ldr \rp, =MSM_DEBUG_UART_PHYS
ldr \rv, =MSM_DEBUG_UART_BASE
.endm
@@
-37,7
+37,7
@@
beq 1001b
.endm
#else
beq 1001b
.endm
#else
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
mov \rv, #0xff000000
orr \rv, \rv, #0x00f00000
.endm
mov \rv, #0xff000000
orr \rv, \rv, #0x00f00000
.endm