diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-03-30 04:51:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-30 04:51:44 -0500 |
commit | cc3d48db75235adf0ae37d3287f6f9e14657d1ae (patch) | |
tree | 1c108ed8b7a5973b6ebbeb08fb5ce7602be0e6fc /include/asm-arm/arch-ixp23xx | |
parent | fd88dd740ad7b92cd399b6116dfa9486b36ffaff (diff) |
[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 @@ | |||
16 | 16 | ||
17 | #define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS) | 17 | #define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS) |
18 | 18 | ||
19 | static __inline__ void putc(char c) | 19 | static inline void putc(char c) |
20 | { | 20 | { |
21 | int j; | 21 | int j; |
22 | 22 | ||
23 | for (j = 0; j < 0x1000; j++) { | 23 | for (j = 0; j < 0x1000; j++) { |
24 | if (UART_BASE[UART_LSR] & UART_LSR_THRE) | 24 | if (UART_BASE[UART_LSR] & UART_LSR_THRE) |
25 | break; | 25 | break; |
26 | barrier(); | ||
26 | } | 27 | } |
27 | 28 | ||
28 | UART_BASE[UART_TX] = c; | 29 | UART_BASE[UART_TX] = c; |
29 | } | 30 | } |
30 | 31 | ||
31 | static void putstr(const char *s) | 32 | static inline void flush(void) |
32 | { | 33 | { |
33 | while (*s) { | ||
34 | putc(*s); | ||
35 | if (*s == '\n') | ||
36 | putc('\r'); | ||
37 | s++; | ||
38 | } | ||
39 | } | 34 | } |
40 | 35 | ||
41 | #define arch_decomp_setup() | 36 | #define arch_decomp_setup() |