diff --git a/[refs] b/[refs]
index 4368224fadff..6ea16e9b04d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bc54e69921a64e8f813de658aef645c960a2904
+refs/heads/master: 49db76eb5fd7d75babb4f3a5f30e86d1f8e82543
diff --git a/trunk/include/asm-arm/arch-pxa/uncompress.h b/trunk/include/asm-arm/arch-pxa/uncompress.h
index 178aa2e073ac..3faad53a6848 100644
--- a/trunk/include/asm-arm/arch-pxa/uncompress.h
+++ b/trunk/include/asm-arm/arch-pxa/uncompress.h
@@ -9,6 +9,9 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/serial_reg.h>
+#include <asm/arch/pxa-regs.h>
+
 #define FFUART		((volatile unsigned long *)0x40100000)
 #define BTUART		((volatile unsigned long *)0x40200000)
 #define STUART		((volatile unsigned long *)0x40700000)
@@ -19,9 +22,11 @@
 
 static inline void putc(char c)
 {
-	while (!(UART[5] & 0x20))
+	if (!(UART[UART_IER] & IER_UUE))
+		return;
+	while (!(UART[UART_LSR] & LSR_TDRQ))
 		barrier();
-	UART[0] = c;
+	UART[UART_TX] = c;
 }
 
 /*