diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:07:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:07:25 +0000 |
| commit | 186f93ea1f274f4cde4a356401c1786c818ff881 (patch) | |
| tree | de28f076c823d5423a5b4780f0d37554c242c982 /arch/arm/mach-davinci | |
| parent | 3560adf62075829393743667ff338dd8fd26a5c2 (diff) | |
| parent | 4e6d488af37980d224cbf298224db6173673f362 (diff) | |
| download | linux-186f93ea1f274f4cde4a356401c1786c818ff881.tar.gz linux-186f93ea1f274f4cde4a356401c1786c818ff881.tar.bz2 linux-186f93ea1f274f4cde4a356401c1786c818ff881.zip | |
Merge branch 'tmpreg' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ux500/include/mach/debug-macro.S
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index 17ab5236da66..3cd93a801d9b 100644 --- a/arch/arm/mach-davinci/include/mach/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S @@ -19,7 +19,7 @@ #include <linux/serial_reg.h> #define UART_SHIFT 2 - .macro addruart, rx + .macro addruart, rx, tmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? moveq \rx, #0x01000000 @ physical base address |