Skip to content
Snippets Groups Projects
Commit ab8fe93b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'picoxcell-fixes' of git://github.com/jamieiles/linux-2.6-ji into fixes

parents 09d37c4b 0836b5cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/arm/mach-picoxcell/include/mach/debug-macro.S
+ 1
− 1
View file @ ab8fe93b
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment