diff --git a/[refs] b/[refs]
index 316815cd2c20..1bee3a59a254 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe73f03549a28204866387311f7d3d9ef5e1503a
+refs/heads/master: d19bd83672dfc1f869e2b2122d99a2ceae7d0f7e
diff --git a/trunk/drivers/tty/serial/serial_ks8695.c b/trunk/drivers/tty/serial/serial_ks8695.c
index 7c13639c597e..9bd004f9da89 100644
--- a/trunk/drivers/tty/serial/serial_ks8695.c
+++ b/trunk/drivers/tty/serial/serial_ks8695.c
@@ -548,8 +548,8 @@ static struct uart_ops ks8695uart_pops = {
 
 static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
 	{
-		.membase	= (void *) KS8695_UART_VA,
-		.mapbase	= KS8695_UART_VA,
+		.membase	= KS8695_UART_VA,
+		.mapbase	= KS8695_UART_PA,
 		.iotype		= SERIAL_IO_MEM,
 		.irq		= KS8695_IRQ_UART_TX,
 		.uartclk	= KS8695_CLOCK_RATE * 16,