diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:44 +0100 |
| commit | 94314a40bcc537c396012e37cf887572f0d82aef (patch) | |
| tree | 489b42e181317730713f8800ac2889039b0faae3 /arch/arm/mach-at91/include/mach/debug-macro.S | |
| parent | 929f58aeeb46f964d9468ce1addd993f5d92b11d (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-at91/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/include/mach/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S index bc1e0b2e2f4..0ed8648c645 100644 --- a/arch/arm/mach-at91/include/mach/debug-macro.S +++ b/arch/arm/mach-at91/include/mach/debug-macro.S @@ -14,7 +14,7 @@ #include <mach/hardware.h> #include <mach/at91_dbgu.h> - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp ldr \rp, =(AT91_BASE_SYS + AT91_DBGU) @ System peripherals (phys address) ldr \rv, =(AT91_VA_BASE_SYS + AT91_DBGU) @ System peripherals (virt address) .endm |