Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-arm / arch-ixp4xx / debug-macro.S

diff --git a/include/asm-arm/arch-ixp4xx/debug-macro.S b/include/asm-arm/arch-ixp4xx/debug-macro.S
index 45a6c6cc29d5f8aa065350191b94ee69dd26fdb5..2e23651e217fc554a073a8ac77337dd795460f52 100644 (file)
--- 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