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 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-footbridge/include/mach/debug-macro.S
b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index
30b971d
..
1be2eeb
100644
(file)
--- a/
arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/
arch/arm/mach-footbridge/include/mach/debug-macro.S
@@
-26,6
+26,7
@@
#include <asm/hardware/debug-8250.S>
#else
#include <asm/hardware/debug-8250.S>
#else
+#include <mach/hardware.h>
/* For EBSA285 debugging */
.equ dc21285_high, ARMCSR_BASE & 0xff000000
.equ dc21285_low, ARMCSR_BASE & 0x00ffffff
/* For EBSA285 debugging */
.equ dc21285_high, ARMCSR_BASE & 0xff000000
.equ dc21285_low, ARMCSR_BASE & 0x00ffffff
@@
-36,8
+37,8
@@
.else
mov \rp, #0
.endif
.else
mov \rp, #0
.endif
- orr \rv, \rp, #
0x42000000
- orr \rp, \rp, #
dc21285_high
+ orr \rv, \rp, #
dc21285_high
+ orr \rp, \rp, #
0x42000000
.endm
.macro senduart,rd,rx
.endm
.macro senduart,rd,rx