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 'picoxcell/soc' into next/soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-clps711x
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-clps711x/include/mach/debug-macro.S
b/arch/arm/mach-clps711x/include/mach/debug-macro.S
index
507c687
..
b802e8a
100644
(file)
--- a/
arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ b/
arch/arm/mach-clps711x/include/mach/debug-macro.S
@@
-14,7
+14,7
@@
#include <mach/hardware.h>
#include <asm/hardware/clps7111.h>
- .macro addruart, rp, rv
+ .macro addruart, rp, rv
, tmp
#ifndef CONFIG_DEBUG_CLPS711X_UART2
mov \rp, #0x0000 @ UART1
#else