linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / arch-iop3xx / uncompress.h

diff --git a/include/asm-arm/arch-iop3xx/uncompress.h b/include/asm-arm/arch-iop3xx/uncompress.h
index fbdd5af..82b8876 100644 (file)
--- 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)