diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-03-30 11:51:44 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-30 11:51:44 +0200 |
| commit | cc3d48db75235adf0ae37d3287f6f9e14657d1ae (patch) | |
| tree | 1c108ed8b7a5973b6ebbeb08fb5ce7602be0e6fc /include/asm-arm/arch-ixp23xx | |
| parent | [ARM] 3434/1: pxa i2s amsl define (diff) | |
| download | linux-cc3d48db75235adf0ae37d3287f6f9e14657d1ae.tar.xz linux-cc3d48db75235adf0ae37d3287f6f9e14657d1ae.zip | |
[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>
Diffstat (limited to 'include/asm-arm/arch-ixp23xx')
| -rw-r--r-- | include/asm-arm/arch-ixp23xx/uncompress.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/asm-arm/arch-ixp23xx/uncompress.h b/include/asm-arm/arch-ixp23xx/uncompress.h index 62623fa9b2f7..013575e6a9a1 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() |