From 68e64af592d048be3efb939389219155efaa26ff Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jeremy.kerr@canonical.com>
Date: Wed, 21 Jul 2010 10:40:50 +0200
Subject: [PATCH] --- yaml --- r: 212671 b: refs/heads/master c:
 1ea64615601229f0dc16dee91dc5b50216411baa h: refs/heads/master i:   212669:
 0f611863b04169f3ef632020827534959f9d4d19   212667:
 8f0bab9772b998e276f55421a557a5aaa43a489e   212663:
 3981e3b367e9e3905d8b33aeca87d4f82c210479   212655:
 140207f811c988e57fb85367e12054490b9a887d   212639:
 c1bf4390a06bbb5d1eb0e56beb418aa29bb0badc   212607:
 4b371249f85c5f2f56f7c76caafe1daf063bc487 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/arm/kernel/debug.S | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a9250b0a8ab3..83d0da5dd5fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d71e3eb5894dbb626dc7e28cfd4f33ebee9a739a
+refs/heads/master: 1ea64615601229f0dc16dee91dc5b50216411baa
diff --git a/trunk/arch/arm/kernel/debug.S b/trunk/arch/arm/kernel/debug.S
index a38b4879441d..f91395206a4b 100644
--- a/trunk/arch/arm/kernel/debug.S
+++ b/trunk/arch/arm/kernel/debug.S
@@ -22,11 +22,11 @@
 #if defined(CONFIG_DEBUG_ICEDCC)
 		@@ debug using ARM EmbeddedICE DCC channel
 
-#if defined(CONFIG_CPU_V6)
-
 		.macro	addruart, rx, tmp
 		.endm
 
+#if defined(CONFIG_CPU_V6)
+
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c0, c5, 0
 		.endm
@@ -51,9 +51,6 @@
 
 #elif defined(CONFIG_CPU_V7)
 
-		.macro	addruart, rx, tmp
-		.endm
-
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c0, c5, 0
 		.endm
@@ -71,9 +68,6 @@ wait:		mrc	p14, 0, pc, c0, c1, 0
 
 #elif defined(CONFIG_CPU_XSCALE)
 
-		.macro	addruart, rx, tmp
-		.endm
-
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c8, c0, 0
 		.endm
@@ -98,9 +92,6 @@ wait:		mrc	p14, 0, pc, c0, c1, 0
 
 #else
 
-		.macro	addruart, rx, tmp
-		.endm
-
 		.macro	senduart, rd, rx
 		mcr	p14, 0, \rd, c1, c0, 0
 		.endm