diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:26:07 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:26:07 -0500 |
| commit | be26a3df0b80307bf8f73cea535c112210151bb9 (patch) | |
| tree | 8e3d90563b6d689ad37500929c05c211153295be /arch/arm/mach-davinci | |
| parent | 918cae14872c56446415299fc17cf98704c9a537 (diff) | |
| parent | 61b603b4ee0c70708539e2fa5c3d47f17b7c7849 (diff) | |
Merge branch 'debug-ll' into omap-for-linus
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 @@ | |||
| 19 | #include <linux/serial_reg.h> | 19 | #include <linux/serial_reg.h> |
| 20 | #define UART_SHIFT 2 | 20 | #define UART_SHIFT 2 |
| 21 | 21 | ||
| 22 | .macro addruart, rx | 22 | .macro addruart, rx, tmp |
| 23 | mrc p15, 0, \rx, c1, c0 | 23 | mrc p15, 0, \rx, c1, c0 |
| 24 | tst \rx, #1 @ MMU enabled? | 24 | tst \rx, #1 @ MMU enabled? |
| 25 | moveq \rx, #0x01000000 @ physical base address | 25 | moveq \rx, #0x01000000 @ physical base address |