From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 30 Mar 2006 09:51:44 +0000 (+0100)
Subject: [ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change
X-Git-Tag: v2.6.17-rc1~23^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3d48db75235adf0ae37d3287f6f9e14657d1ae;p=linux-2.6

[ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change

Patch from Lennert Buytenhek

Adapt ixp23xx uncompress.h to a081568d7016061ed848696984e3acf1ba0b3054.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/include/asm-arm/arch-ixp23xx/uncompress.h b/include/asm-arm/arch-ixp23xx/uncompress.h
index 62623fa9b2..013575e6a9 100644
--- a/include/asm-arm/arch-ixp23xx/uncompress.h
+++ b/include/asm-arm/arch-ixp23xx/uncompress.h
@@ -16,26 +16,21 @@
 
 #define UART_BASE	((volatile u32 *)IXP23XX_UART1_PHYS)
 
-static __inline__ void putc(char c)
+static inline void putc(char c)
 {
 	int j;
 
 	for (j = 0; j < 0x1000; j++) {
 		if (UART_BASE[UART_LSR] & UART_LSR_THRE)
 			break;
+		barrier();
 	}
 
 	UART_BASE[UART_TX] = c;
 }
 
-static void putstr(const char *s)
+static inline void flush(void)
 {
-	while (*s) {
-		putc(*s);
-		if (*s == '\n')
-			putc('\r');
-		s++;
-	}
 }
 
 #define arch_decomp_setup()