summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-ixp4xx/debug-macro.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 00:32:01 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 00:32:01 +0200
commitf647a27417d2adc43d8c96d3d6f837422fbc076e (patch)
tree3cac5147575ba4cbd63cb8fa226b95e7886e1d7c /include/asm-arm/arch-ixp4xx/debug-macro.S
parent[PATCH] fs/qnx4/*: fix sparse warnings (diff)
parent[PATCH] ARM: 2748/1: ixp2000 implementation of the iomap api (diff)
downloadlinux-f647a27417d2adc43d8c96d3d6f837422fbc076e.tar.xz
linux-f647a27417d2adc43d8c96d3d6f837422fbc076e.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/debug-macro.S')
-rw-r--r--include/asm-arm/arch-ixp4xx/debug-macro.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/include/asm-arm/arch-ixp4xx/debug-macro.S
index 4499ae8e4b44..45a6c6cc29d5 100644
--- a/include/asm-arm/arch-ixp4xx/debug-macro.S
+++ b/include/asm-arm/arch-ixp4xx/debug-macro.S
@@ -14,6 +14,7 @@
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0xc8000000
+ orrne \rx, \rx, #0x00b00000
movne \rx, #0xff000000
add \rx,\rx,#3 @ Uart regs are at off set of 3 if
@ byte writes used - Big Endian.