From b392627a6c29b045dc263f958e4e0979ad33b72d Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 22 Mar 2006 20:14:09 +0000
Subject: [PATCH] --- yaml --- r: 22853 b: refs/heads/master c:
 e99053e07514e514611167ad648c65c87982c4d9 h: refs/heads/master i:   22851:
 497b70131c00d85ae389a2bf6a80d2d3a4dda0b3 v: v3

---
 [refs]                                          |  2 +-
 .../include/asm-arm/arch-ixp2000/debug-macro.S  | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 7fcb00894002..32071e159451 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd115ea007e671e96b8b53c2e0e885103d39fd40
+refs/heads/master: e99053e07514e514611167ad648c65c87982c4d9
diff --git a/trunk/include/asm-arm/arch-ixp2000/debug-macro.S b/trunk/include/asm-arm/arch-ixp2000/debug-macro.S
index 5631e0889861..bc8b39654793 100644
--- a/trunk/include/asm-arm/arch-ixp2000/debug-macro.S
+++ b/trunk/include/asm-arm/arch-ixp2000/debug-macro.S
@@ -23,18 +23,5 @@
 #endif
 		.endm
 
-		.macro	senduart,rd,rx
-		strb	\rd, [\rx]
-		.endm
-
-		.macro	busyuart,rd,rx
-1002:		ldrb	\rd, [\rx, #0x14]
-		tst	\rd, #0x20
-		beq	1002b
-		.endm
-
-		.macro	waituart,rd,rx
-		nop
-		nop
-		nop
-		.endm
+#define UART_SHIFT	2
+#include <asm/hardware/debug-8250.S>