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

diff --git a/include/asm-arm/arch-iop3xx/uncompress.h b/include/asm-arm/arch-iop3xx/uncompress.h
index fbdd5af64..82b88762c 100644
--- a/include/asm-arm/arch-iop3xx/uncompress.h
+++ b/include/asm-arm/arch-iop3xx/uncompress.h
@@ -1,6 +1,7 @@
 /*
  *  linux/include/asm-arm/arch-iop3xx/uncompress.h
  */
+#include <linux/config.h>
 #include <asm/types.h>
 #include <asm/mach-types.h>
 #include <linux/serial_reg.h>
@@ -18,15 +19,23 @@ static volatile UTYPE uart_base;
 
 #define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
 
-static inline void putc(char c)
+static __inline__ void putc(char c)
 {
-	while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
-		barrier();
+	while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE);
 	*uart_base = c;
 }
 
-static inline void flush(void)
+/*
+ * This does not append a newline
+ */
+static void putstr(const char *s)
 {
+	while (*s) {
+		putc(*s);
+		if (*s == '\n')
+			putc('\r');
+		s++;
+	}
 }
 
 static __inline__ void __arch_decomp_setup(unsigned long arch_id)