From 6e7c62407d4f815b5132fce553fe4068841cf5b4 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Mon, 6 Dec 2010 19:36:32 -0600 Subject: [PATCH] --- yaml --- r: 222967 b: refs/heads/master c: da8f2e246183ae109f87694ee3f06e8fcca2931b h: refs/heads/master i: 222965: 8349c8315db38e7bd8761ad2735b5a519e8db947 222963: 0548cc37fc24f9bff9bd2ee43713df1730cd87c3 222959: f63f619e00db3989352122c576df309068897e64 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/include/mach/debug-macro.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 588757d39932..67300b14a8e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7787d2c2f440cc7854bed3d039bf4cc59d9e7897 +refs/heads/master: da8f2e246183ae109f87694ee3f06e8fcca2931b diff --git a/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S b/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S index 8ea3bffb4e00..a0e7c12868bd 100644 --- a/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S +++ b/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S @@ -21,8 +21,8 @@ #include .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)