diff options
| author | Thomas Abraham <thomas.ab@samsung.com> | 2011-03-25 10:18:18 +0300 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-28 11:17:54 +0400 |
| commit | b9ab19f936e823c31e66702ee553e4d18e910c9a (patch) | |
| tree | 82e998836ddacf4c616b9025098d0e0413e67787 /arch | |
| parent | 1af3c67212d1694977b6da47b4451a9b019e7606 (diff) | |
| download | linux-b9ab19f936e823c31e66702ee553e4d18e910c9a.tar.xz | |
ARM: EXYNOS4: Fix addruart macro
Fix incorrect conditional execution of ldr instructions in
addruart macro.
Signed-off-by: Thomas Abraham <thomas.abraham@samsung.com>
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos4/include/mach/debug-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/debug-macro.S b/arch/arm/mach-exynos4/include/mach/debug-macro.S index 58bbd049a6c4..a442ef861167 100644 --- a/arch/arm/mach-exynos4/include/mach/debug-macro.S +++ b/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) |