diff --git a/[refs] b/[refs]
index d12757f1e888..edfbb14c5344 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99793c660c811309ae4ca94cc9cf1c2f34940197
+refs/heads/master: 288e9feb51f428377d486e18a107c144554e5e40
diff --git a/trunk/drivers/serial/altera_uart.c b/trunk/drivers/serial/altera_uart.c
index fbc8f8e4ffaa..dfc1ecc40abc 100644
--- a/trunk/drivers/serial/altera_uart.c
+++ b/trunk/drivers/serial/altera_uart.c
@@ -421,7 +421,7 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)
 		port->iotype = SERIAL_IO_MEM;
 		port->irq = platp[i].irq;
 		port->uartclk = platp[i].uartclk;
-		port->flags = ASYNC_BOOT_AUTOCONF;
+		port->flags = UPF_BOOT_AUTOCONF;
 		port->ops = &altera_uart_ops;
 		port->private_data = platp;
 	}
@@ -551,7 +551,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
 	port->iotype = SERIAL_IO_MEM;
 	port->uartclk = platp->uartclk;
 	port->ops = &altera_uart_ops;
-	port->flags = ASYNC_BOOT_AUTOCONF;
+	port->flags = UPF_BOOT_AUTOCONF;
 	port->private_data = platp;
 
 	uart_add_one_port(&altera_uart_driver, port);