aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-11-11 10:34:20 -0800
committerOlof Johansson <olof@lixom.net>2011-11-11 10:34:20 -0800
commitab8fe93b2fb3ccc9ef46f7d6779b2f1813145d5c (patch)
tree2aa6e9429aee92f8007b34018cfa1a33a118119b
parent09d37c4ba9b20d6b694bfd7339850ba9a826fb13 (diff)
parent0836b5cdd23d573bf7ec57f73ff774b3ad660bf4 (diff)
downloadlinux-linaro-stable-ab8fe93b2fb3ccc9ef46f7d6779b2f1813145d5c.tar.gz
Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes
-rw-r--r--arch/arm/mach-picoxcell/include/mach/debug-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-picoxcell/include/mach/debug-macro.S b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
index 8f2c234ed9d9..58d4ee3ae949 100644
--- a/arch/arm/mach-picoxcell/include/mach/debug-macro.S
+++ b/arch/arm/mach-picoxcell/include/mach/debug-macro.S
@@ -14,7 +14,7 @@
#define UART_SHIFT 2
- .macro addruart, rp, rv
+ .macro addruart, rp, rv, tmp
ldr \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)
ldr \rp, =PICOXCELL_UART1_BASE
.endm