X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-integrator%2Funcompress.h;fp=include%2Fasm-arm%2Farch-integrator%2Funcompress.h;h=3957402741d393456279a23dd4dd342d22ca854f;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f61825c4d9018d5011653790ca978461f2899536;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-arm/arch-integrator/uncompress.h b/include/asm-arm/arch-integrator/uncompress.h
index f61825c4d..395740274 100644
--- a/include/asm-arm/arch-integrator/uncompress.h
+++ b/include/asm-arm/arch-integrator/uncompress.h
@@ -28,18 +28,21 @@
 /*
  * This does not append a newline
  */
-static void putc(int c)
+static void putstr(const char *s)
 {
-	while (AMBA_UART_FR & (1 << 5))
-		barrier();
+	while (*s) {
+		while (AMBA_UART_FR & (1 << 5));
 
-	AMBA_UART_DR = c;
-}
+		AMBA_UART_DR = *s;
 
-static inline void flush(void)
-{
-	while (AMBA_UART_FR & (1 << 3))
-		barrier();
+		if (*s == '\n') {
+			while (AMBA_UART_FR & (1 << 5));
+
+			AMBA_UART_DR = '\r';
+		}
+		s++;
+	}
+	while (AMBA_UART_FR & (1 << 3));
 }
 
 /*