diff options
| author |   Olof Johansson <olof@lixom.net> | 2010-12-06 19:36:32 -0600 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-06 20:07:57 -0800 |
| commit | da8f2e246183ae109f87694ee3f06e8fcca2931b (patch) | |
| tree | 2b56c78a2c1cdfa3c1909fe6af7d8f063adeabd6 /arch | |
| parent | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (diff) | |
| download | linux-dev-da8f2e246183ae109f87694ee3f06e8fcca2931b.tar.xz linux-dev-da8f2e246183ae109f87694ee3f06e8fcca2931b.zip | |
ARM: tegra: fix regression from addruart rewrite
Commit 0ea129300982 ("arm: return both physical and virtual addresses
from addruart") took out the test for MMU on/off but didn't switch the
ldr instructions to no longer be conditionals based on said test.
Fix that.
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/debug-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S index 8ea3bffb4e00..a0e7c12868bd 100644 --- a/arch/arm/mach-tegra/include/mach/debug-macro.S +++ b/arch/arm/mach-tegra/include/mach/debug-macro.S @@ -21,8 +21,8 @@ #include <mach/io.h> .macro addruart, rp, rv - ldreq \rp, =IO_APB_PHYS @ physical - ldrne \rv, =IO_APB_VIRT @ virtual + ldr \rp, =IO_APB_PHYS @ physical + ldr \rv, =IO_APB_VIRT @ virtual #if defined(CONFIG_TEGRA_DEBUG_UART_NONE) #error "A debug UART must be selected in the kernel config to use DEBUG_LL" #elif defined(CONFIG_TEGRA_DEBUG_UARTA) |