summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-ixp4xx/debug-macro.S
diff options
context:
space:
mode:
authorArtem B. Bityuckiy <dedekind@infradead.org>2005-07-06 18:43:18 +0400
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-07-06 21:40:38 +0400
commitb3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch)
treed17c31c0eac0a7290ba5011b59a100fd9e9c9532 /include/asm-arm/arch-ixp4xx/debug-macro.S
parent6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff)
parenta18bcb7450840f07a772a45229de4811d930f461 (diff)
downloadlinux-b3539219c9ea20ebf6a5ea3cc534f423a3607c41.tar.xz
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/debug-macro.S')
-rw-r--r--include/asm-arm/arch-ixp4xx/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/include/asm-arm/arch-ixp4xx/debug-macro.S
index 45a6c6cc29d5..2e23651e217f 100644
--- a/include/asm-arm/arch-ixp4xx/debug-macro.S
+++ b/include/asm-arm/arch-ixp4xx/debug-macro.S
@@ -14,8 +14,8 @@
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
moveq \rx, #0xc8000000
- orrne \rx, \rx, #0x00b00000
movne \rx, #0xff000000
+ orrne \rx, \rx, #0x00b00000
add \rx,\rx,#3 @ Uart regs are at off set of 3 if
@ byte writes used - Big Endian.
.endm