diff --git a/[refs] b/[refs]
index b26a45cc6929..47051a0bd066 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72af4762ee640b717a30761e27fc55126c686568
+refs/heads/master: 44ed76b78e158d852f640d533b7acc08b91f2132
diff --git a/trunk/drivers/tty/serial/altera_jtaguart.c b/trunk/drivers/tty/serial/altera_jtaguart.c
index aa2a4caaa1c3..8f014bb916b7 100644
--- a/trunk/drivers/tty/serial/altera_jtaguart.c
+++ b/trunk/drivers/tty/serial/altera_jtaguart.c
@@ -445,7 +445,7 @@ static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 	port->type = PORT_ALTERA_JTAGUART;
 	port->iotype = SERIAL_IO_MEM;
 	port->ops = &altera_jtaguart_ops;
-	port->flags = ASYNC_BOOT_AUTOCONF;
+	port->flags = UPF_BOOT_AUTOCONF;
 
 	uart_add_one_port(&altera_jtaguart_driver, port);