diff --git a/[refs] b/[refs]
index 935e779136b6..fb69c6167f3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a788c6b78802b4a378be3f0d4c2da30da811620
+refs/heads/master: a333aeb73b45d2b6bbaaebd56f9e7e3a674ac039
diff --git a/trunk/include/asm-arm/arch-pxa/uncompress.h b/trunk/include/asm-arm/arch-pxa/uncompress.h
index 3faad53a6848..dadf4c20b622 100644
--- a/trunk/include/asm-arm/arch-pxa/uncompress.h
+++ b/trunk/include/asm-arm/arch-pxa/uncompress.h
@@ -12,10 +12,7 @@
 #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)
-#define HWUART		((volatile unsigned long *)0x41600000)
+#define __REG(x)	((volatile unsigned long *)x)
 
 #define UART		FFUART