diff options
| author | Russell King | 2010-02-25 23:07:25 +0100 |
|---|---|---|
| committer | Russell King | 2010-02-25 23:07:25 +0100 |
| commit | 186f93ea1f274f4cde4a356401c1786c818ff881 (patch) | |
| tree | de28f076c823d5423a5b4780f0d37554c242c982 /arch/arm/mach-davinci | |
| parent | Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dm... (diff) | |
| parent | ARM: 5910/1: ARM: Add tmp register for addruart and loadsp (diff) | |
| download | kernel-qcow2-linux-186f93ea1f274f4cde4a356401c1786c818ff881.tar.gz kernel-qcow2-linux-186f93ea1f274f4cde4a356401c1786c818ff881.tar.xz kernel-qcow2-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 |