Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-realview / include / mach / uncompress.h

diff --git a/arch/arm/mach-realview/include/mach/uncompress.h b/arch/arm/mach-realview/include/mach/uncompress.h
index 415d634d52ab2b8153a24de774e5159357c01a02..83050378ffd2b2cb0d51d0eacbe3d27e13b3a0c9 100644 (file)
--- a/arch/arm/mach-realview/include/mach/uncompress.h
+++ b/arch/arm/mach-realview/include/mach/uncompress.h
@@ -24,6 +24,7 @@
 #include <mach/board-pb11mp.h>
 #include <mach/board-pb1176.h>
 #include <mach/board-pba8.h>
+#include <mach/board-pbx.h>
 
 #define AMBA_UART_DR(base)     (*(volatile unsigned char *)((base) + 0x00))
 #define AMBA_UART_LCRH(base)   (*(volatile unsigned char *)((base) + 0x2c))
@@ -43,6 +44,8 @@ static inline unsigned long get_uart_base(void)
                return REALVIEW_PB1176_UART0_BASE;
        else if (machine_is_realview_pba8())
                return REALVIEW_PBA8_UART0_BASE;
+       else if (machine_is_realview_pbx())
+               return REALVIEW_PBX_UART0_BASE;
        else
                return 0;
 }