diff --git a/[refs] b/[refs]
index b2f705e54bb9..40d00dd3cec5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd88dd740ad7b92cd399b6116dfa9486b36ffaff
+refs/heads/master: cc3d48db75235adf0ae37d3287f6f9e14657d1ae
diff --git a/trunk/include/asm-arm/arch-ixp23xx/uncompress.h b/trunk/include/asm-arm/arch-ixp23xx/uncompress.h
index 62623fa9b2f7..013575e6a9a1 100644
--- a/trunk/include/asm-arm/arch-ixp23xx/uncompress.h
+++ b/trunk/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()