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 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
[pandora-kernel.git]
/
arch
/
arm
/
mach-picoxcell
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-picoxcell/include/mach/debug-macro.S
b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
index
8f2c234
..
58d4ee3
100644
(file)
--- a/
arch/arm/mach-picoxcell/include/mach/debug-macro.S
+++ b/
arch/arm/mach-picoxcell/include/mach/debug-macro.S
@@
-14,7
+14,7
@@
#define UART_SHIFT 2
#define UART_SHIFT 2
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
ldr \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)
ldr \rp, =PICOXCELL_UART1_BASE
.endm
ldr \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)
ldr \rp, =PICOXCELL_UART1_BASE
.endm