Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

arch/arm/mach-picoxcell/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -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