From 272aa86815e86192c88e2deb38c32f28648ae187 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Fri, 25 Mar 2011 16:18:18 +0900 Subject: [PATCH] --- yaml --- r: 243048 b: refs/heads/master c: b9ab19f936e823c31e66702ee553e4d18e910c9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos4/include/mach/debug-macro.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c319d9f56225..bff2e4a80b63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1af3c67212d1694977b6da47b4451a9b019e7606 +refs/heads/master: b9ab19f936e823c31e66702ee553e4d18e910c9a diff --git a/trunk/arch/arm/mach-exynos4/include/mach/debug-macro.S b/trunk/arch/arm/mach-exynos4/include/mach/debug-macro.S index 58bbd049a6c4..a442ef861167 100644 --- a/trunk/arch/arm/mach-exynos4/include/mach/debug-macro.S +++ b/trunk/arch/arm/mach-exynos4/include/mach/debug-macro.S @@ -21,8 +21,8 @@ */ .macro addruart, rp, rv - ldreq \rp, = S3C_PA_UART - ldrne \rv, = S3C_VA_UART + ldr \rp, = S3C_PA_UART + ldr \rv, = S3C_VA_UART #if CONFIG_DEBUG_S3C_UART != 0 add \rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART) add \rv, \rv, #(0x10000 * CONFIG_DEBUG_S3C_UART)