]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change
authorLennert Buytenhek <buytenh@wantstofly.org>
Thu, 30 Mar 2006 09:51:44 +0000 (10:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 30 Mar 2006 09:51:44 +0000 (10:51 +0100)
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>
include/asm-arm/arch-ixp23xx/uncompress.h

index 62623fa9b2f7a12f1a65c3f55e0e379f9563462d..013575e6a9a1bd5b3d262cc81fc825c173aa3a60 100644 (file)
 
 #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()