diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-11 13:34:20 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-11 13:34:20 -0500 |
| commit | ab8fe93b2fb3ccc9ef46f7d6779b2f1813145d5c (patch) | |
| tree | 2aa6e9429aee92f8007b34018cfa1a33a118119b | |
| parent | 09d37c4ba9b20d6b694bfd7339850ba9a826fb13 (diff) | |
| parent | 0836b5cdd23d573bf7ec57f73ff774b3ad660bf4 (diff) | |
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.S | 2 |
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 @@ | |||
| 14 | 14 | ||
| 15 | #define UART_SHIFT 2 | 15 | #define UART_SHIFT 2 |
| 16 | 16 | ||
| 17 | .macro addruart, rp, rv | 17 | .macro addruart, rp, rv, tmp |
| 18 | ldr \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE) | 18 | ldr \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE) |
| 19 | ldr \rp, =PICOXCELL_UART1_BASE | 19 | ldr \rp, =PICOXCELL_UART1_BASE |
| 20 | .endm | 20 | .endm |