diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
| commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
| tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-netx/include/mach/debug-macro.S | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-netx/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-netx/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/include/mach/debug-macro.S b/arch/arm/mach-netx/include/mach/debug-macro.S index 56a915228180..247781e096e2 100644 --- a/arch/arm/mach-netx/include/mach/debug-macro.S +++ b/arch/arm/mach-netx/include/mach/debug-macro.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include "hardware.h" | 14 | #include "hardware.h" |
| 15 | 15 | ||
| 16 | .macro addruart, rp, rv | 16 | .macro addruart, rp, rv, tmp |
| 17 | mov \rp, #0x00000a00 | 17 | mov \rp, #0x00000a00 |
| 18 | orr \rv, \rp, #io_p2v(0x00100000) @ virtual | 18 | orr \rv, \rp, #io_p2v(0x00100000) @ virtual |
| 19 | orr \rp, \rp, #0x00100000 @ physical | 19 | orr \rp, \rp, #0x00100000 @ physical |