diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:15:29 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 23:15:29 +0900 |
| commit | d63638440cfad75fb339fd1261bea0485c7c3ecc (patch) | |
| tree | d1705ceeef82eb0b7b58f9503a472be810f418f2 /arch/arm/mach-clps711x/include/mach/debug-macro.S | |
| parent | f1e0477a7b7a541f51eea279910eed4ddd010033 (diff) | |
| parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-clps711x/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S index 507c6873b7ee..b802e8a51831 100644 --- a/arch/arm/mach-clps711x/include/mach/debug-macro.S +++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S @@ -14,7 +14,7 @@ #include <mach/hardware.h> #include <asm/hardware/clps7111.h> - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp #ifndef CONFIG_DEBUG_CLPS711X_UART2 mov \rp, #0x0000 @ UART1 #else |