diff --git a/[refs] b/[refs]
index fc4de888bdbb..f7411d02084f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d454446e2b83b4e1e2997b2c6e689c85ab61868
+refs/heads/master: 3a8daaa49fb71d90e45d1e86d7f9f9e298bda05c
diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c
index 0ce2b4a45e6d..cf29a2d0ba4c 100644
--- a/trunk/drivers/serial/imx.c
+++ b/trunk/drivers/serial/imx.c
@@ -810,7 +810,7 @@ static struct imx_port imx_ports[] = {
 		.type		= PORT_IMX,
 		.iotype		= UPIO_MEM,
 		.membase	= (void *)IMX_UART1_BASE,
-		.mapbase	= IMX_UART1_BASE, /* FIXME */
+		.mapbase	= 0x00206000,
 		.irq		= UART1_MINT_RX,
 		.uartclk	= 16000000,
 		.fifosize	= 32,
@@ -826,7 +826,7 @@ static struct imx_port imx_ports[] = {
 		.type		= PORT_IMX,
 		.iotype		= UPIO_MEM,
 		.membase	= (void *)IMX_UART2_BASE,
-		.mapbase	= IMX_UART2_BASE, /* FIXME */
+		.mapbase	= 0x00207000,
 		.irq		= UART2_MINT_RX,
 		.uartclk	= 16000000,
 		.fifosize	= 32,