From b5e581c762330db5d8ea9de30fbad78838117981 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@codeaurora.org>
Date: Wed, 27 Oct 2010 13:04:58 -0700
Subject: [PATCH] --- yaml --- r: 221006 b: refs/heads/master c:
 06125ff051d535eaa993d83db66ab893248861af h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-msm/include/mach/debug-macro.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ac9560a7dc2..0aa71166b57d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcd72c3e0aff4b68d648d37ece423f2ccaf95337
+refs/heads/master: 06125ff051d535eaa993d83db66ab893248861af
diff --git a/trunk/arch/arm/mach-msm/include/mach/debug-macro.S b/trunk/arch/arm/mach-msm/include/mach/debug-macro.S
index f792e01d2c8e..646b99ebc773 100644
--- a/trunk/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/trunk/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -19,7 +19,7 @@
 #include <mach/hardware.h>
 #include <mach/msm_iomap.h>
 
-#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
+#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE)
 	.macro	addruart, rp, rv
 	ldr	\rp, =MSM_DEBUG_UART_PHYS
 	ldr	\rv, =MSM_DEBUG_UART_BASE