diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-l7200/include/mach/debug-macro.S | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
| download | linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.gz linux-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.bz2 linux-3a8254364277fabe01bc0e12b9691722939f5ef3.zip | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-l7200/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-l7200/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-l7200/include/mach/debug-macro.S b/arch/arm/mach-l7200/include/mach/debug-macro.S index b0a2db77d392..0b4e760159b9 100644 --- a/arch/arm/mach-l7200/include/mach/debug-macro.S +++ b/arch/arm/mach-l7200/include/mach/debug-macro.S @@ -14,7 +14,7 @@ .equ io_virt, IO_BASE .equ io_phys, IO_START - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp mov \rp, #0x00044000 @ UART1 @ mov \rp, #0x00045000 @ UART2 add \rv, \rp, #io_virt @ virtual address |