diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 02:19:52 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 02:19:52 +0200 |
| commit | 18594822fcb01d4b35e05b9018f770a0b4156d1a (patch) | |
| tree | 38d35c38086a564beaac215f8e52694cdbfab1c3 /include/asm-arm/arch-imx/debug-macro.S | |
| parent | [PATCH] jffs2: memory leak in jffs2_scan_medium() (diff) | |
| parent | [PATCH] dl2k needs dma-mapping.h (diff) | |
| download | linux-18594822fcb01d4b35e05b9018f770a0b4156d1a.tar.xz linux-18594822fcb01d4b35e05b9018f770a0b4156d1a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-arm/arch-imx/debug-macro.S')
| -rw-r--r-- | include/asm-arm/arch-imx/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-imx/debug-macro.S b/include/asm-arm/arch-imx/debug-macro.S index 83f552f7bcc1..c611871643a2 100644 --- a/include/asm-arm/arch-imx/debug-macro.S +++ b/include/asm-arm/arch-imx/debug-macro.S @@ -16,7 +16,7 @@ tst \rx, #1 @ MMU enabled? moveq \rx, #0x00000000 @ physical movne \rx, #0xe0000000 @ virtual - orr \rx, \rx, #0x00200000 + orreq \rx, \rx, #0x00200000 @ physical orr \rx, \rx, #0x00006000 @ UART1 offset .endm |