From 33bfd49c3959761c31fa6f827c0e314675535659 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Fri, 1 Oct 2010 17:22:37 +0400 Subject: [PATCH] --- yaml --- r: 213517 b: refs/heads/master c: 288e9feb51f428377d486e18a107c144554e5e40 h: refs/heads/master i: 213515: 9e1ba3eda2880bf4bb5e46fdd70161c5826dfa9e v: v3 --- [refs] | 2 +- trunk/drivers/serial/altera_uart.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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);